Changeset 30574 for main/trunk/greenstone3/userweb.cmd

Timestamp:

2016-06-16T19:20:23+12:00 (8 years ago)

Author:

ak19

Message:

Improving dispersed GS3: changes to util.pm fix the bug whereby the perl code always write to gs2build\tmp when building, even if the Greenstone folder is not writable. Now the TMP env var location is used and the tmp files get written to TMP\greenstone\web when the GS folder is not writable. Further tidied up bat and cmd files to remove extra variables, to break out of loop reading in build.properties file when the necessary properties are found.

File:

• main/trunk/greenstone3/userweb.cmd (modified) (2 diffs)

main/trunk/greenstone3/userweb.cmd

@@ -14 +14 @@
 set INSTALLDIR=!GSDL3SRCHOME!
 set USERWEB=
-set IS_TMP_TOMCAT=
 
 :: Loosely based on http://stackoverflow.com/questions/7708681/how-to-read-from-a-properties-file-using-batch-script 
@@ -20 +19 @@
 :: http://scripts.dragon-it.co.uk/scripts.nsf/docs/batch-search-replace-substitute!OpenDocument&ExpandSection=3&BaseTarget=East&AutoFramed
 for /F "tokens=1,2 delims==" %%G in (!GSDL3SRCHOME!\build.properties) do ( 
-    if "%%G"=="web.home" set USERWEB=%%H& set USERWEB=!USERWEB:/=\!
-    if "%%G"=="gsdl3home.isreadonly" set IS_TMP_TOMCAT=%%H
+    if "%%G"=="web.home" set USERWEB=%%H& set USERWEB=!USERWEB:/=\!& goto found 
 )
+
+:found
 echo USERWEB: !USERWEB!
-echo IS_TMP_TOMCAT: !IS_TMP_TOMCAT!
 
 if "!USERWEB!" == "" echo No userweb directory provided & echo. & goto done