Diff

Differences From Artifact [49efe2ef77]:

To Artifact [e5124a01c0]:


    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" "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"
           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"
    44     44   
    45         -			unzip "tmp-tcl.zip"
    46         -			rm -f "tmp-tcl.zip"
           45  +			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
    47     51   
    48         -			unzip "tmp-itcl.zip"
    49         -			rm -f "tmp-itcl.zip"
           52  +			gzip -dc "tmp-itcl.tar.gz" | tar -xf -
           53  +			rm -f "tmp-itcl.tar.gz"
    50     54   
    51         -			unzip "tmp-thread.zip"
    52         -			rm -f "tmp-thread.zip"
           55  +			gzip -dc "tmp-thread.tar.gz" | tar -xf -
           56  +			rm -f "tmp-thread.tar.gz"
    53     57   
    54         -			unzip "tmp-tclconfig.zip"
    55         -			rm -f "tmp-tclconfig.zip"
           58  +			gzip -dc "tmp-tclconfig.tar.gz" | tar -xf -
           59  +			rm -f "tmp-tclconfig.tar.gz"
    56     60   
    57     61   			rm -rf "tcl${TCLVERS}"
    58     62   			mv "tcl-${CVSTAG}" "tcl${TCLVERS}"
    59     63   			mv "itcl-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl"
    60     64   			mv "thread-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread"
    61     65   			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl/tclconfig"
    62     66   			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread/tclconfig"
    63     67   			mv "tclconfig-${CVSTAG}" "tcl${TCLVERS}/tclconfig"
    64     68   
    65         -			if [ -d "tcl${TCLVERS}" ]; then
    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
           69  +			tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
    68     70   
    69         -				tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
    70         -			fi
    71         -
    72         -			rm -f "tmp-tcl.zip" "tmp-itcl.zip" "tmp-thread.zip" "tmp-tclconfig.zip"
           71  +			rm -f "tmp-tcl.tar.gz" "tmp-itcl.tar.gz" "tmp-thread.tar.gz" "tmp-tclconfig.tar.gz"
    73     72   			rm -rf "tcl-${CVSTAG}" "itcl-${CVSTAG}" "thread-${CVSTAG}" "tclconfig-${CVSTAG}"
    74     73   			rm -rf "tcl${TCLVERS}"
    75     74   		)
    76     75   	else
    77     76   		rm -f "${SRC}.tmp"
    78     77   		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
    79     78   		mv "${SRC}.tmp" "${SRC}"