Changeset 20925 for gsdl/trunk/bin/script/full-rebuild.pl

Timestamp:

2009-11-10T20:52:58+13:00 (14 years ago)

Author:

oranfry

Message:

Since we can now have a Perl installation inside Greenstone on linux as well, full and incremental build and import perl scripts also launch perl with the -S flag in the Linux case now (not just in the Windows case anymore).

File:

• gsdl/trunk/bin/script/full-rebuild.pl (modified) (1 diff)

gsdl/trunk/bin/script/full-rebuild.pl

@@ -104 +104 @@
 
     my $launch_cmd = "";
-    if($ENV{'GSDLOS'} =~ m/windows/) {
-    if($ENV{'PERLPATH'}) {
-        # need to ensure that the path to perl is quoted (in case there's spaces in it)
+    if($ENV{'PERLPATH'}) {
+    # need to ensure that the path to perl is quoted (in case there's spaces in it)
+    if($ENV{'GSDLOS'} =~ m/windows/) {
         $launch_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S ";
     } else {
-        $launch_cmd = "perl -S ";
+        $launch_cmd = "\"$ENV{'PERLPATH'}/perl\" -S ";
     }
+    } else {
+    $launch_cmd = "perl -S ";
     }