Changeset 31473 for main/trunk/greenstone3/gs3-setup.bat

Timestamp:

2017-03-08T20:33:18+13:00 (7 years ago)

Author:

ak19

Message:

Bugfixes (2) to previous commit: splitting long lines with carets requires a space before or after the caret. But a set command can't start with a space, and the ampersand character chaining commands should not leave trailing white space in the previous set operation else the white space becomes part of the variable assignment done with the set.

File:

• main/trunk/greenstone3/gs3-setup.bat (modified) (2 diffs)

main/trunk/greenstone3/gs3-setup.bat

@@ -93 +93 @@
 :: ---- if gs2build is there, run its setup.bat file ----
 :: http://stackoverflow.com/questions/69068/long-commands-split-over-multiple-lines-in-windows-vista-batch-bat-file
-endlocal & set DEBUG=%DEBUG%& set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%^
- & set GSDL3SRCHOME=%GSDL3SRCHOME%& set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
+endlocal & set DEBUG=%DEBUG%& set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& ^
+set GSDL3SRCHOME=%GSDL3SRCHOME%& set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
 
 if exist gs2build\setup.bat (
@@ -344 +344 @@
 :: Restore global variables that would otherwise be lost at script's end due to their having been initialised in a
 :: set local/set enabledelayedexpansion section. See http://ss64.com/nt/endlocal.html
-endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%^
- & set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
+endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& ^
+set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
 
 :end