Changeset 24362 for main/trunk/greenstone2/bin/script/incremental-import-onlyadd.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/incremental-import-onlyadd.pl (modified) (5 diffs)

main/trunk/greenstone2/bin/script/incremental-import-onlyadd.pl

@@ -31 +31 @@
 
 
-
 BEGIN {
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
@@ -38 +37 @@
 }
 
-
 use strict;
-
-use Config; # for getting the perlpath in the recommended way
 use dbutil;
 use util;
@@ -60 +56 @@
     exit(-1);
     }
-
 
     my $collection = pop @argv;
@@ -109 +104 @@
     my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
     
-
-    my $import_cmd = "import.pl";
-    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";
-    }
+    my $import_cmd = "\"".&util::get_perl_exec()."\" -S import.pl";
 
     if (-e $archiveinf_doc) {
-    $import_cmd .= " -keepold";
-    
+    $import_cmd .= " -keepold"; 
     }
     else {
@@ -135 +118 @@
 
     $import_cmd .= " $quoted_argv \"$collection\"";
-
     
     my $import_status = system($import_cmd)/256;