Changeset 24300 for main/trunk/greenstone2

Timestamp:

2011-07-20T20:44:20+12:00 (13 years ago)

Author:

ak19

Message:

Correction to reset-gsdlhome changes for Windows after testing on windows.

File:

• main/trunk/greenstone2/gsicontrol.bat (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.bat

@@ -184 +184 @@
 if not exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto relocate
 
-FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome "%cgibin%\gsdlsite.cfg"') do set gshome=%%G
-if "x%gshome%" == "x%GSDLHOME%" set gshome=& goto exit
+FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome "%GSDLHOME%\%cgibin%\gsdlsite.cfg"') do set gshome=%%G
+:: before string comparison, remove any quotes around gsdlhome value defined in config file
+if not [%gshome%] == [] set gshome=%gshome:"=%
+if "%gshome%" == "%GSDLHOME%" set gshome=& goto exit
   
 move "%GSDLHOME%\%cgibin%\gsdlsite.cfg" "%GSDLHOME%\%cgibin%\gsdlsite.cfg.bak"