Changeset 1383 in ProjectBuilder

Timestamp:

Dec 23, 2011, 4:06:33 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix bugs introduced by the CPAN addition in the other cases

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -2039 +2039 @@
 
     # It's already ready for CPAN
+    my $shcmdbase = $shcmd;
     if ($cmt !~ /^CPAN/) {
-        $shcmd .= "\"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"";
+        $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"";
     }
     pb_system("$shcmd","Executing pbscript on $cptarget if needed","verbose");
@@ -2079 +2080 @@
             print KEEP "$made\n";
             close(KEEP);
-            pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
+            pb_system("$shcmdbase \"rm -rf $tdir $bdir\"","$cmt cleanup");
 
             # Sign packages locally
@@ -2127 +2128 @@
             $hoption = "" ;
         }
-        pb_system("$shcmd \"sudo $hpath $hoption \"; $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
+        pb_system("$shcmdbase \"sudo $hpath $hoption \"; $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {