Changeset 24363 for main/trunk/greenstone2

Timestamp:

2011-08-03T21:27:23+12:00 (13 years ago)

Author:

ak19

Message:

The method of locating perl has changed once more: util.pm now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use. On Windows, setup.bat sets up the PERLPATH env var to the perl included with Greenstone when working with binaries. The same is done for Linux for symmetry, although perl is not included with GS in a linux GS binary at present.

Location:

main/trunk/greenstone2

Files:

• setup.bash (modified) (1 diff)
• setup.bat (modified) (2 diffs)

main/trunk/greenstone2/setup.bash

@@ -317 +317 @@
 if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl" ] ; then
 
-    PATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin:$PATH
-    export PATH
+    if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin" ] ; then
+        PERLPATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin
+        export PERLPATH
+        PATH=$PERLPATH:$PATH
+        export PATH
+    fi   
 
     if test "$GSDLOS" = "linux" ; then

main/trunk/greenstone2/setup.bat

@@ -39 +39 @@
 
 if "!GS_CP_SET!" == "yes" goto Success
-set PATH=!GSDLHOME!\bin\windows\perl\bin;!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH!
+set PATH=!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH!
+if exist "!GSDLHOME!\bin\windows\perl\bin" (
+    set PERLPATH=!GSDLHOME!\bin\windows\perl\bin
+    set PATH=!PERLPATH!;!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH! 
+)
+
 set GS_CP_SET=yes
 goto Success
@@ -61 +66 @@
 
 if "!GS_CP_SET!" == "yes" goto Success
-set PATH="!GSDLHOME!\bin\windows\perl\bin";"!GSDLHOME!\bin\windows";"!GSDLHOME!\bin\script";"!PATH!"
+set PATH=!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH!
+if exist "!GSDLHOME!\bin\windows\perl\bin" (
+    set PERLPATH=!GSDLHOME!\bin\windows\perl\bin
+    set PATH=!PERLPATH!;!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH! 
+)
 set GS_CP_SET=yes
 goto Success