Changeset 1461

Timestamp:

04/11/12 20:48:09 (14 months ago)

Author:

bruno

Message:

• Fix missing usage of extdir for Web delivery in case of test versions.

File:

• devel/pb/bin/pb (modified) (1 diff)

devel/pb/bin/pb

@@ -1120 +1120 @@
             print SCRIPT "#set -x\n";
             print SCRIPT "echo ... Extracting Website content\n";
-            print SCRIPT "find . -type f | grep -Ev '^./$pbpkg-$pbver.tar.gz|^./pbscript' | xargs rm -f non-existent\n";
+            print SCRIPT "find . -type f | grep -Ev '^./$pbpkg-$pbver$pbextdir.tar.gz|^./pbscript' | xargs rm -f non-existent\n";
             print SCRIPT "find * -type d -depth | xargs rmdir 2> /dev/null \n";
-            print SCRIPT "tar xfz $pbpkg-$pbver.tar.gz\n";
-            print SCRIPT "mv $pbpkg-$pbver/* .\n";
-            print SCRIPT "rm -f $pbpkg-$pbver.tar.gz\n";
-            print SCRIPT "rmdir $pbpkg-$pbver\n";
+            print SCRIPT "tar xfz $pbpkg-$pbver$pbextdir.tar.gz\n";
+            print SCRIPT "mv $pbpkg-$pbver$pbextdir/* .\n";
+            print SCRIPT "rm -f $pbpkg-$pbver$pbextdir.tar.gz\n";
+            print SCRIPT "rmdir $pbpkg-$pbver$pbextdir\n";
             close(SCRIPT);
             chmod 0755,"$ENV{'PBTMP'}/pbscript";