From: eldy <>
Date: Sun, 28 Dec 2008 14:03:16 +0000 (+0000)
Subject: Fix: makepack
X-Git-Tag: AWSTATS_6_9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3733e9d8f9a09ab4523db8a61e86bbe3c4819fde;p=thirdparty%2FAWStats.git

Fix: makepack
---

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index cdff1e93..70407c5b 100644
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -122,7 +122,7 @@ while (! $found) {
 		printf(" %d - %3s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
 	}
 
-	# On demande de choisir le fichier à passer
+	# On demande de choisir le fichier � passer
 	print "Choose one package number or several separated with space: ";
 	$NUM_SCRIPT=<STDIN>; 
 	chomp($NUM_SCRIPT);
@@ -277,12 +277,13 @@ rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
     	}	
     
     	if ($target eq 'ZIP') {
-        		unlink $FILENAMEZIP.zip;
-        		print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+			unlink $FILENAMEZIP.zip;
+			print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
      		chdir("$BUILDROOT");
-    		#print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
-    		#$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-    		$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+    		#print "cd $BUILDROOT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+    		#$ret=`cd $BUILDROOT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+    		print "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ/*\n";
+    		$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ/*`;
     		print "Move $FILENAMEZIP.zip to $DESTI\n";
     		rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
     		next;