Changeset 20925 for gsdl

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).

Location:

gsdl/trunk/bin/script

Files:

• full-buildcol.pl (modified) (1 diff)
• full-import.pl (modified) (1 diff)
• full-rebuild.pl (modified) (1 diff)
• incremental-buildcol.pl (modified) (1 diff)
• incremental-import.pl (modified) (1 diff)
• incremental-rebuild.pl (modified) (1 diff)

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

@@ -40 +40 @@
 
 my $buildcol_cmd = "buildcol.pl -removeold $quoted_argv";
-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/) {
     $buildcol_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $buildcol_cmd";
     } else {
-    $buildcol_cmd = "perl -S $buildcol_cmd";
+    $buildcol_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $buildcol_cmd";
     }
+} else {
+    $buildcol_cmd = "perl -S $buildcol_cmd";
 }
 

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

@@ -40 +40 @@
 
 my $import_cmd = "import.pl -removeold $quoted_argv";
-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/) {
     $import_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $import_cmd";
     } else {
-    $import_cmd = "perl -S $import_cmd";
+    $import_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $import_cmd";
     }
+} else {
+    $import_cmd = "perl -S $import_cmd";
 }
 

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 ";
     }
     

gsdl/trunk/bin/script/incremental-buildcol.pl

@@ -108 +108 @@
     
     my $buildcol_cmd = "buildcol.pl";
-    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/) {  
         $buildcol_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $buildcol_cmd";
     } else {
-        $buildcol_cmd = "perl -S $buildcol_cmd";
+        $buildcol_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $buildcol_cmd";
     }
+    } else {
+    $buildcol_cmd = "perl -S $buildcol_cmd";
     }
 

gsdl/trunk/bin/script/incremental-import.pl

@@ -107 +107 @@
 
     my $import_cmd = "import.pl";
-    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/) {
         $import_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $import_cmd";
     } else {
-        $import_cmd = "perl -S $import_cmd";
+        $import_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $import_cmd";
     }
+    } else {
+    $import_cmd = "perl -S $import_cmd";
     }
+
     if (-e $archiveinf_doc) {
     $import_cmd .= " -incremental";

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

@@ -85 +85 @@
     
     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 ";
     }