Changeset 23650 for main/trunk/greenstone2

Timestamp:

2011-02-01T22:13:06+13:00 (13 years ago)

Author:

ak19

Message:

Fixes to get OpenOffice plugin's options to show up in GLI without calling GS2's setup.bat manually (it should be called by gli.bat). It wasn't getting called anymore because of the newly added setup.bat file in the openoffice extension, whose subtle interactions with the rest of the gli.bat procedure caused the call to GS2's setup.bat to be skipped.

File:

• main/trunk/greenstone2/setup.bat (modified) (2 diffs)

main/trunk/greenstone2/setup.bat

@@ -96 +96 @@
 
 :End
+popd
 endlocal & set PATH=%PATH%& set GSDLHOME=%GSDLHOME%& set GSDLOS=%GSDLOS%
 
+pushd
+cd "%GSDLHOME%"
 if exist ext (
     for /D %%e IN ("ext/*") do (
-        cd ext\%%e
+        cd "ext\%%e"
         if EXIST setup.bat call setup.bat
-        cd ..\..
+        cd "%GSDLHOME%"
     )
 )
+popd
+
 setlocal enabledelayedexpansion
-
+pushd
+cd "%GSDLHOME%"
 if exist apache-httpd (
   echo +Adding in executable path for apache-httpd
@@ -123 +129 @@
   set PATH=!GSDLHOME!\local\bin;!PATH!
 )
+popd
 
 :: test writability of GSDLHOME
 @call "!GSDLHOME!\bin\script\checkwritability.bat"
-popd
-
 endlocal & set PATH=%PATH%& set GSDLHOME=%GSDLHOME%& set GSDLOS=%GSDLOS%