Changeset 1913 in ProjectBuilder

Timestamp:

Oct 14, 2014, 2:54:00 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Use back /bin/bash (vs /usr/bin/bash as it wasn't available on older distributions). Use a variable in the future probably. Sufficiently

compatible for now.

File:

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

devel/pb/bin/pb

@@ -2637 +2637 @@
             close(DOCKER);
         } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
-            $dkcmd = "/usr/bin/bash $homedir/$tdir-2/".basename($pbscript1);
-            #$dkcmd .= "/usr/bin/bash $homedir/$tdir-2/".basename($pbscript1)." ;  if [ '$pbkeep' == '0' ]; then rm -f $pbscript1; fi ; ";
+            $dkcmd = "/bin/bash $homedir/$tdir-2/".basename($pbscript1);
+            #$dkcmd .= "/bin/bash $homedir/$tdir-2/".basename($pbscript1)." ;  if [ '$pbkeep' == '0' ]; then rm -f $pbscript1; fi ; ";
         } else {
             $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript1 ]; then $pbscript1; fi ;  if [ $pbkeep == 0 ]; then rm -f $pbscript1; fi\' | bash\"";
@@ -2659 +2659 @@
         my $ts = "$ENV{'PBTMP'}/vebuild/".basename($pbscript1);
         open(DOCKER," > $ts") || confess "Unable to create $ts";
-        print DOCKER "#!/usr/bin/bash\n";
+        print DOCKER "#!/bin/bash\n";
         print DOCKER "# Put content from host to guest, copying to have the correct uid/gid and rights to do so\n";
         print DOCKER "# set -x\n";