Changeset 492 in ProjectBuilder

Timestamp:

Jun 19, 2008, 12:41:21 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug on script2vm which wasn't working anymore.
• Makes script execution verbose

File:

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

devel/pb/bin/pb

@@ -867 +867 @@
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript";
-    } elsif (($cmt eq "Script") || ($cmt eq "Announce")) {
+    } elsif ($cmt eq "Script") {
+        $src="$src $ENV{'PBDESTDIR'}/pbscript";
+    } elsif ($cmt eq "Announce") {
         $src="$src $ENV{'PBTMP'}/pbscript";
     } elsif ($cmt eq "Packages") {
@@ -1051 +1053 @@
     #pb_system("cd $cptarget ; sudo chown -R $sshlogin->{$ENV{'PBPROJ'}} .","$cmt chown in $cptarget to $sshlogin->{$ENV{'PBPROJ'}}");
     #}
-    pb_system("$shcmd \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed");
+    pb_system("$shcmd \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         # Get back info on pkg produced, compute their name and get them from the VM