Changeset 125 in ProjectBuilder

Timestamp:

Sep 9, 2007, 12:22:56 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix lots of small issues for 2ssh functions

File:

• 0.7.3/pb/bin/pb (modified) (6 diffs)

0.7.3/pb/bin/pb

@@ -353 +353 @@
     }
     # Keep track of what is generated so that we can get them back from VMs
-    open(KEEP,"> $ENV{'PBDESTDIR'}/pbgen") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen";
+    open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
     print KEEP "$made\n";
     close(KEEP);
@@ -394 +394 @@
 
     my $src = "";
-    my $vertag;
     chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pbpkg (@pkgs) {
-        $vertag = $pkg->{$pbpkg};
+        my $vertag = $pkg->{$pbpkg};
         # get the version of the current package - maybe different
         ($pbver,$pbtag) = split(/-/,$vertag);
@@ -409 +408 @@
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$vertag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen";
-        my $src = <KEEP>;
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
+        $src = <KEEP>;
         chomp($src);
         close(KEEP);
@@ -421 +420 @@
         }
     }
+    my $basesrc = map { basename($_) } split(/ /,$src);
 
     print $LOG "$cmt: $src\n" if ($debug >= 0);
@@ -436 +436 @@
     }
     $port = $sshport->{$ENV{'PBPROJ'}};
-    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $src\"","Preparing $tdir on $mac");
+    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 \"cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\"","Executing pbscript on $mac");
+    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; rm -f ./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/pbgen-$vertag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$vertag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$vertag";
+        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>;
         chomp($src);
@@ -459 +459 @@
     open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
     print SCRIPT "#!/bin/bash\n";
+    print SCRIPT "echo ... Execution needed\n";
     print SCRIPT "# Move the copied .pbrc to the home dir on the build account\n";
     print SCRIPT "mv .pbrc \$ENV{'HOME'}\n";