Diff

Differences From Artifact [e5124a01c0]:

To Artifact [f5d1586cab]:


    32     32   			CVSTAG="trunk"
    33     33   		fi
    34     34   		export CVSTAG
    35     35   
    36     36   		(
    37     37   			cd src || exit 1
    38     38   
    39         -			rm -f "tmp-tcl.tar.gz" "tmp-itcl.tar.gz" "tmp-thread.tar.gz" "tmp-tclconfig.tar.gz"
    40         -			wget -O "tmp-tcl.tar.gz" "http://core.tcl.tk/tcl/tarball/tcl-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-tcl.tar.gz'
    41         -			wget -O "tmp-itcl.tar.gz" "http://rkeene.org/projects/tcl/itcl.fossil/tarball/itcl-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-itcl.tar.gz'
    42         -			wget -O "tmp-thread.tar.gz" "http://rkeene.org/projects/tcl/thread.fossil/tarball/thread-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-thread.tar.gz"
    43         -			wget -O "tmp-tclconfig.tar.gz" "http://rkeene.org/projects/tcl/tclconfig.fossil/tarball/tclconfig-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-tclconfig.tar.gz"
           39  +			workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}"
           40  +			rm -rf "${workdir}"
           41  +
           42  +			mkdir "${workdir}" || exit 1
           43  +			cd "${workdir}" || exit 1
           44  +
           45  +			wget -O "tmp-tcl.tar.gz" "http://core.tcl.tk/tcl/tarball/tcl-fossil.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-tcl.tar.gz'
           46  +			wget -O "tmp-itcl.tar.gz" "http://rkeene.org/projects/tcl/itcl.fossil/tarball/itcl-fossil.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-itcl.tar.gz'
           47  +			wget -O "tmp-thread.tar.gz" "http://core.tcl.tk/thread/tarball/thread-fossil.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-thread.tar.gz"
           48  +			wget -O "tmp-tclconfig.tar.gz" "http://core.tcl.tk/tclconfig/tarball/tclconfig-fossil.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-tclconfig.tar.gz"
    44     49   
    45     50   			gzip -dc 'tmp-tcl.tar.gz' | tar -xf -
    46         -			rm -f "tmp-tcl.tar.gz"
    47         -			if [ -d "tcl-${CVSTAG}.tar" ]; then
    48         -				rm -rf "tcl-${CVSTAG}"
    49         -				mv "tcl-${CVSTAG}.tar" "tcl-${CVSTAG}"
    50         -			fi
    51         -
    52     51   			gzip -dc "tmp-itcl.tar.gz" | tar -xf -
    53         -			rm -f "tmp-itcl.tar.gz"
    54         -
    55     52   			gzip -dc "tmp-thread.tar.gz" | tar -xf -
    56         -			rm -f "tmp-thread.tar.gz"
    57         -
    58     53   			gzip -dc "tmp-tclconfig.tar.gz" | tar -xf -
    59         -			rm -f "tmp-tclconfig.tar.gz"
    60     54   
    61         -			rm -rf "tcl${TCLVERS}"
    62         -			mv "tcl-${CVSTAG}" "tcl${TCLVERS}"
    63         -			mv "itcl-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl"
    64         -			mv "thread-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread"
    65         -			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl/tclconfig"
    66         -			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread/tclconfig"
    67         -			mv "tclconfig-${CVSTAG}" "tcl${TCLVERS}/tclconfig"
           55  +			mv "tcl-fossil" "tcl${TCLVERS}"
           56  +			mv "itcl-fossil" "tcl${TCLVERS}/pkgs/itcl"
           57  +			mv "thread-fossil" "tcl${TCLVERS}/pkgs/thread"
           58  +			cp -r "tclconfig-fossil" "tcl${TCLVERS}/pkgs/itcl/tclconfig"
           59  +			cp -r "tclconfig-fossil" "tcl${TCLVERS}/pkgs/thread/tclconfig"
           60  +			mv "tclconfig-fossil" "tcl${TCLVERS}/tclconfig"
    68     61   
    69         -			tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
           62  +			tar -cf - "tcl${TCLVERS}" | gzip -c > "../../${SRC}"
    70     63   
    71         -			rm -f "tmp-tcl.tar.gz" "tmp-itcl.tar.gz" "tmp-thread.tar.gz" "tmp-tclconfig.tar.gz"
    72         -			rm -rf "tcl-${CVSTAG}" "itcl-${CVSTAG}" "thread-${CVSTAG}" "tclconfig-${CVSTAG}"
    73         -			rm -rf "tcl${TCLVERS}"
    74         -		)
           64  +			cd ..
           65  +
           66  +			rm -rf "${workdir}"
           67  +		) || exit 1
    75     68   	else
    76     69   		rm -f "${SRC}.tmp"
    77     70   		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
    78     71   		mv "${SRC}.tmp" "${SRC}"
    79     72   	fi
    80     73   fi
    81     74