Changeset 24362 for main/trunk/greenstone2/perllib/util.pm

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/perllib/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -31 +31 @@
 use File::Copy;
 use File::Basename;
+# Config for getting the perlpath in the recommended way, though it uses paths that are
+# hard-coded into the Config file that's generated upon configuring and compiling perl.
+# $^X works better in some cases to return the path to perl used to launch the script,
+# but if launched with plain "perl" (no full-path), that will be just what it returns.
+use Config; 
 
 # removes files (but not directories)
@@ -1604 +1609 @@
 }
 
+sub get_perl_exec() {   
+    my $perl_exec = $^X; # may return just "perl"
+    
+    if($ENV{'PERLPATH'}) {
+        # OR: # $perl_exec = &util::filename_cat($ENV{'PERLPATH'},"perl");
+        if($ENV{'GSDLOS'} =~ m/windows/) {
+            $perl_exec = "$ENV{'PERLPATH'}\\Perl.exe";
+        } else {
+            $perl_exec = "$ENV{'PERLPATH'}/perl";
+        }
+    } else { # no PERLPATH, use Config{perlpath} else $^X: special variables
+        # containing the full path to the current perl executable we're using
+        $perl_exec = $Config{perlpath}; # configured path for perl
+        if (!-e $perl_exec) { # may not point to location on this machine
+            $perl_exec = $^X; # may return just "perl"
+            if($perl_exec =~ m/^perl/i) { # warn if just perl or Perl.exe
+                print STDERR "**** WARNING: Perl exec found contains no path: $perl_exec";              
+            }
+        }
+    }
+    
+    return $perl_exec;
+}
+
+
 1;