[Astlinux-commits] SF.net SVN: astlinux: [1614] trunk

[<dha...@us...>]

Revision: 1614
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1614&view=rev
Author:   dhartman
Date:     2008-03-02 19:17:24 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
getter script cleanup; disable progress meter, force consistent options--namely passive ftp

Modified Paths:
--------------
    trunk/Makefile
    trunk/toolchain/getter_script.sh

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-03-03 03:11:03 UTC (rev 1613)
+++ trunk/Makefile	2008-03-03 03:17:24 UTC (rev 1614)
@@ -220,6 +220,11 @@
 
 show_targets: var.TARGETS
 
+show_version: val.ASTVER
+
+val.%:
+	@echo "$($*)"
+
 var.%:
 	@echo '$*="$($*)"'
 

Modified: trunk/toolchain/getter_script.sh
===================================================================
--- trunk/toolchain/getter_script.sh	2008-03-03 03:11:03 UTC (rev 1613)
+++ trunk/toolchain/getter_script.sh	2008-03-03 03:17:24 UTC (rev 1614)
@@ -3,7 +3,9 @@
 # what a great idea...
 SITE=files.astlinux.org
 
-wget --passive-ftp --timeout=30 -c -t 2 $@ || (
+WGET_ARGS="--passive-ftp --timeout=30 -c -t 2 -nv"
+
+wget ${WGET_ARGS} $@ || (
 	echo Retrying from astlinux alternate site...
 	index=$#-1
 	# Copy all params into an array
@@ -11,7 +13,7 @@
 	# Chop all but filename from last param and prepend out URL
 	a[$index]=${a[index]/*\//http:\/\/$SITE/}
 	# Now wget that from our server
-	wget --timeout=30 -c -t 2 ${a[@]}
+	wget ${WGET_ARGS} ${a[@]}
 )
 
 
@@ -22,7 +24,7 @@
 
 FILE=`basename $URL`
 
-wget --timeout=30 -t 2 -P dl -c "$SITE"/"$FILE".sha1
+wget ${WGET_ARGS} -P dl "$SITE"/"$FILE".sha1
 
 if `sha1sum -c --status dl/"$FILE".sha1`
 then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.