Changeset 24362 for main/trunk/greenstone2/bin/script/full-import.pl

Timestamp:

2011-08-03T21:17:30+12:00 (13 years ago)

Author:

ak19

Message:

The method of locating perl has changed once more: util now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use.

File:

• main/trunk/greenstone2/bin/script/full-import.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/full-import.pl

@@ -33 +33 @@
 BEGIN {
     die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }
 
 use strict;
-use Config; # for getting the perlpath in the recommended way
+use util;
 
 my $quoted_argv = join(" ", map { "\"$_\"" } @ARGV);
 
-my $import_cmd = "import.pl -removeold $quoted_argv";
-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 = "\"$ENV{'PERLPATH'}/perl\" -S $import_cmd";
-    }
-} else {
-    #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-    $import_cmd = "\"$Config{perlpath}\" -S $import_cmd";
-}
+# need to ensure that the path to perl is quoted (in case there's spaces in it)
+my $import_cmd = "\"".&util::get_perl_exec()."\" -S import.pl -removeold $quoted_argv";   
 
 my $import_status = system($import_cmd)/256;