Changeset 23665

Timestamp:

2011-02-03T17:55:45+13:00 (13 years ago)

Author:

ak19

Message:

More corrections to setup.bat to get it to work with extensions like for OpenOffice and PDFBox: these latest corrections are needed when installing Greenstone in an admin area in a path with spaces.

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
+set savedir=%CD%
 cd "%GSDLHOME%"
-if exist ext (
-    for /D %%e IN ("ext/*") do (
-        cd "ext\%%e"
-        if EXIST setup.bat call setup.bat
-        cd ..\..
-    )
+if exist ext (  
+    for /D %%e IN ("ext/*") do call :addexts %%e
 )
-popd
+cd "%savedir%"
+set savedir=
+goto :doneexts
 
+:addexts
+set folder=%1
+cd "ext\%folder%"       
+if EXIST setup.bat call setup.bat
+cd ..\..
+goto :eof
+
+:doneexts
 setlocal enabledelayedexpansion
-pushd
-cd "%GSDLHOME%"
-if exist apache-httpd (
+
+if exist "%GSDLHOME%\apache-httpd" (
   echo +Adding in executable path for apache-httpd
   set PATH=!GSDLHOME!\apache-httpd\!GSDLOS!\bin;!PATH!
@@ -119 +123 @@
 )
 
-if exist local (
-  if exist local\setup.bat (
+if exist "%GSDLHOME%\local" (
+  if exist "!GSDLHOME!\local\setup.bat" (
     echo.
-    echo Running local\setup.bat
-    cd local
+    echo Running !GSDLHOME!\local\setup.bat
+    cd "!GSDLHOME!\local"
     call setup.bat 
-    cd ..
+    cd "!GSDLHOME!"
   )
   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%