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

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-07-23 22:13:35 +0000 (Sun, 23 Jul 2006)
New Revision: 65

Modified:
   branches/nix-scripts/methods/commonmeth.sh
   branches/nix-scripts/methods/wget
   branches/nix-scripts/methods/write-fetch-wget
Log:
Fix the code to actually generate a valid script

Modified: branches/nix-scripts/methods/commonmeth.sh
===================================================================
--- branches/nix-scripts/methods/commonmeth.sh	2006-07-23 21:47:21 UTC (rev 64)
+++ branches/nix-scripts/methods/commonmeth.sh	2006-07-23 22:13:35 UTC (rev 65)
@@ -26,7 +26,8 @@
 	}
 EOF
 
-source write-fetch-$METHOD
+echo METHOD=$METHOD
+. ${METHODSDIR}/methods/write-fetch-${METHOD}
 
 ###############
 # add check code, if is wanted

Modified: branches/nix-scripts/methods/wget
===================================================================
--- branches/nix-scripts/methods/wget	2006-07-23 21:47:21 UTC (rev 64)
+++ branches/nix-scripts/methods/wget	2006-07-23 22:13:35 UTC (rev 65)
@@ -1,5 +1,6 @@
 #!/bin/bash -e
-METHOD=(basename $0)
 
-source commonmeth.sh
+[ -r "${SHAREDIR}/common.sh" ] || SHAREDIR=/usr/share/apt-zip
 
+source ${SHAREDIR}/commonmeth.sh
+

Modified: branches/nix-scripts/methods/write-fetch-wget
===================================================================
--- branches/nix-scripts/methods/write-fetch-wget	2006-07-23 21:47:21 UTC (rev 64)
+++ branches/nix-scripts/methods/write-fetch-wget	2006-07-23 22:13:35 UTC (rev 65)
@@ -3,7 +3,7 @@
 
 #$2 contains the local file and $1 contains the URL
 fetch () {
-	    wget -t3 -nv -O \$2 \$1
+	    wget -t3 -nv -O \$1 \$2
 }
 
 EOF