Diff

Differences From Artifact [178995da06]:

To Artifact [f95adb2a3c]:


    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.zip"
    40         -			wget -O "tmp-tcl.zip" "http://tcltk.oc9.org/fossils/tcl/zip/unnamed-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-tcl.zip"
           39  +			rm -f "tmp-tcl.zip" "tmp-itcl.zip" "tmp-thread.zip" "tmp-tclconfig.zip"
           40  +			wget -O "tmp-tcl.zip" "http://rkeene.org/projects/tcl/tcl.fossil/zip/tcl-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-tcl.zip"
           41  +			wget -O "tmp-itcl.zip" "http://rkeene.org/projects/tcl/itcl.fossil/zip/itcl-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-itcl.zip"
           42  +			wget -O "tmp-thread.zip" "http://rkeene.org/projects/tcl/thread.fossil/zip/thread-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-thread.zip"
           43  +			wget -O "tmp-tclconfig.zip" "http://rkeene.org/projects/tcl/tclconfig.fossil/zip/tclconfig-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-tclconfig.zip"
           44  +
    41     45   			unzip "tmp-tcl.zip"
    42     46   			rm -f "tmp-tcl.zip"
    43     47   
           48  +			unzip "tmp-itcl.zip"
           49  +			rm -f "tmp-itcl.zip"
           50  +
           51  +			unzip "tmp-thread.zip"
           52  +			rm -f "tmp-thread.zip"
           53  +
           54  +			unzip "tmp-tclconfig.zip"
           55  +			rm -f "tmp-tclconfig.zip"
           56  +
    44     57   			rm -rf "tcl${TCLVERS}"
    45         -			mv "unnamed-${CVSTAG}" "tcl${TCLVERS}"
           58  +			mv "tcl-${CVSTAG}" "tcl${TCLVERS}"
           59  +			mv "itcl-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl"
           60  +			mv "thread-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread"
           61  +			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl/tclconfig"
           62  +			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread/tclconfig"
           63  +			mv "tclconfig-${CVSTAG}" "tcl${TCLVERS}/tclconfig"
    46     64   
    47     65   			if [ -d "tcl${TCLVERS}" ]; then
    48     66   				find "tcl${TCLVERS}" -name configure -type f | xargs chmod +x
           67  +				find "tcl${TCLVERS}" '(' -name install-sh -o -name install.sh ')' -type f | xargs chmod +x
    49     68   
    50     69   				tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
    51     70   			fi
           71  +
           72  +			rm -f "tmp-tcl.zip" "tmp-itcl.zip" "tmp-thread.zip" "tmp-tclconfig.zip"
           73  +			rm -rf "tcl-${CVSTAG}" "itcl-${CVSTAG}" "thread-${CVSTAG}" "tclconfig-${CVSTAG}"
    52     74   		)
    53     75   	else
    54     76   		rm -f "${SRC}.tmp"
    55     77   		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
    56     78   		mv "${SRC}.tmp" "${SRC}"
    57     79   	fi
    58     80   fi