Changeset 892 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Oct 29, 2009, 2:35:35 AM (14 years ago)

Author:

Bruno Cornec

Message:

• remove call to bash to use generic sh. This has o be checked for compatibility issues
• In conf file, when having a dependency on Module-Build, it has to be first, as some other may depend on it

File:

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

devel/pb/bin/pb

@@ -1444 +1444 @@
     # Do not touch when just announcing
     if ($cmt ne "Announce") {
-        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $cptarget");
+        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | sh\"","Preparing $tdir on $cptarget");
     } else {
         $logres = "> ";
@@ -1455 +1455 @@
     }
 
-    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
+    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | sh\"","Executing pbscript on $cptarget if needed","verbose");
     if ($cmt =~ /^V[EM]build/) {
         # Get back info on pkg produced, compute their name and get them from the VM
@@ -1520 +1520 @@
             }
         }
-        pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
+        pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | sh ; sleep 10","VM $v halt (pid $vmpid)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {
@@ -2386 +2386 @@
         my $dir = $m;
         $dir =~ s/-.*//;
-        pb_system("rm -rf $m"."* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m"."* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf $m"."*","Installing perl module $m-$osperlver->{$m}");
+        pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | sh" ,"Installing perl module $m-$osperlver->{$m}");
     }