Changeset 135 in ProjectBuilder for 0.7.4/pb/bin/pb

Timestamp:

Sep 11, 2007, 1:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

delivery in ssh delivery should only be used for VMs

File:

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

0.7.4/pb/bin/pb

@@ -434 +434 @@
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
     } elsif ($cmt eq "VMs") {
-        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
+        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}")."/delivery";
     } elsif ($cmt eq "Packages") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
@@ -444 +444 @@
 
     $port = $sshport->{$ENV{'PBPROJ'}};
-    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir/delivery ; cd $tdir/delivery ; rm -f $basesrc\"","Preparing $tdir on $mac");
-    pb_system("scp -p -P $port $src $mac:$tdir/delivery","$cmt delivery in $tdir on $mac");
-    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir/delivery ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
+    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $basesrc\"","Preparing $tdir on $mac");
+    pb_system("scp -p -P $port $src $mac:$tdir","$cmt delivery in $tdir on $mac");
+    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
     if ($cmt eq "VMs") {
         # Get back info on pkg produced, compute their name and get them from the VM
-        pb_system("scp -p -P $port $mac:$tdir/delivery/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
+        pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
         my $src = <KEEP>;
@@ -456 +456 @@
         $src =~ s/^ *//;
         $src =~ s/ +/,/g;
-        pb_system("scp -p -P $port $mac:$tdir/delivery/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
-        #pb_system("ssh -q -p $port $mac \"rm -rf $tdir ; sido /usr/bin/poweroff\"","VM cleanup and halt on $mac");
+        pb_system("scp -p -P $port $mac:$tdir/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
+        #pb_system("ssh -q -p $port $mac \"rm -rf dirname("$sshdir->{$ENV{'PBPROJ'}}"); sudo /usr/bin/poweroff\"","VM cleanup and halt on $mac");
         pb_send2ssh("Packages","$odir"."_"."$over");
         pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");