[Apt-zip-devel] r69 - branches/nix-scripts/methods

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-07-23 23:07:59 +0000 (Sun, 23 Jul 2006)
New Revision: 69

Modified:
   branches/nix-scripts/methods/commonmeth.sh
   branches/nix-scripts/methods/write-fetch-lynx
   branches/nix-scripts/methods/write-fetch-wget
Log:
fix order of parameters for fetch function; always URL, then local file

Modified: branches/nix-scripts/methods/commonmeth.sh
===================================================================
--- branches/nix-scripts/methods/commonmeth.sh	2006-07-23 22:47:09 UTC (rev 68)
+++ branches/nix-scripts/methods/commonmeth.sh	2006-07-23 23:07:59 UTC (rev 69)
@@ -80,8 +80,7 @@
 	cat <<-EOF
 
 	do_fetch() {
-	    #wget -t3 -nv -O \$2 \$1
-	    fetch \$2 \$1
+	    fetch \$1 \$2
 	    ${CHECK} \$2 \$4 \$?
 	    ${SLEEPCMD}
 	    return \$?
@@ -107,8 +106,7 @@
 		        "$TAR" "$TAREXTRACT" "$OLDTARFILE" \$2
 		        if [ -r \$2 ] && ${CHECK} \$2 \$4 \$? ; then echo "Already got \$2"; return 0; fi
 		    fi
-		    #wget -nc -t3 -nv -O \$2 \$1
-		    fetch \$2 \$1
+		    fetch \$1 \$2
 		    ${CHECK} \$2 \$4 \$?
 		    ${SLEEPCMD}
 		    return \$?
@@ -119,8 +117,7 @@
 	cat <<-EOF
 	do_fetch() {
 	    if [ -r ../\$2 ] && ${CHECK} ../\$2 \$4 \$? ; then echo "Already got \$2"; return 1; fi
-	    #wget -t3 -nv -O \$2 \$1
-	    fetch \$2 \$1
+	    fetch \$1 \$2
 	    ${CHECK} \$2 \$4 \$?
 	    ${SLEEPCMD}
 	    return \$?

Modified: branches/nix-scripts/methods/write-fetch-lynx
===================================================================
--- branches/nix-scripts/methods/write-fetch-lynx	2006-07-23 22:47:09 UTC (rev 68)
+++ branches/nix-scripts/methods/write-fetch-lynx	2006-07-23 23:07:59 UTC (rev 69)
@@ -1,7 +1,7 @@
 
 cat <<-EOF
 
-#$2 contains the local file and $1 contains the URL
+#\$2 contains the local file and \$1 contains the URL
 fetch () {
 	    lynx -dump \$1 > \$2
 }

Modified: branches/nix-scripts/methods/write-fetch-wget
===================================================================
--- branches/nix-scripts/methods/write-fetch-wget	2006-07-23 22:47:09 UTC (rev 68)
+++ branches/nix-scripts/methods/write-fetch-wget	2006-07-23 23:07:59 UTC (rev 69)
@@ -1,9 +1,9 @@
 
 cat <<-EOF
 
-#$2 contains the local file and $1 contains the URL
+#\$2 contains the local file and \$1 contains the URL
 fetch () {
-	    wget -t3 -nv -O \$1 \$2
+	    wget -t3 -nv -O \$2 \$1
 }
 
 EOF