Changeset 23650 for main

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.

Location:

main/trunk

Files:

• gli/gli.bat (modified) (4 diffs)
• greenstone2/setup.bat (modified) (2 diffs)

main/trunk/gli/gli.bat

@@ -1 +1 @@
 @echo off
 color 0A
-pushd "%CD%"
+set startdir=%CD%
+rem pushd "%CD%"
 CD /D "%~dp0"
 set GLILANG=en
@@ -71 +72 @@
     if "%1" == "Elevated" shift
 
+:: Make sure we're in the GLI folder, even if located outside a GS installation
+CD /D "%~dp0"
+
 :findPerl
 :: Now need to find Perl. If found, PERLPATH will be set 
@@ -192 +196 @@
 pause
 color 07
-popd
+rem popd
 
 :done
@@ -204 +208 @@
 set PROGABBR=
 color 07
-popd
+rem popd
+cd "%startdir%"
+set startdir=

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%