Index: /devel/pb/bin/pb
===================================================================
--- /devel/pb/bin/pb	(revision 1382)
+++ /devel/pb/bin/pb	(revision 1383)
@@ -2039,6 +2039,7 @@
 
 	# 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,5 +2080,5 @@
 			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,5 +2128,5 @@
 			$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)) {