Changeset 34099

Timestamp:

2020-04-09T11:32:58+12:00 (4 years ago)

Author:

ak19

Message:

1. Corrected setting of JAVA_TOOL_OPTIONS in setup.bat to preserve any earlier values. 2. Now the Linux script, setup.bash is also brought up to speed to export the file.encoding=UTF-8 java property via JAVA_TOOL_OPTONS, which then gets passed to tomcat in build.xml.

Location:

main/trunk/greenstone2

Files:

• setup.bash (modified) (1 diff)
• setup.bat (modified) (1 diff)

main/trunk/greenstone2/setup.bash

@@ -408 +408 @@
 # https://www.gnu.org/software/wget/manual/html_node/Wgetrc-Location.html
 export WGETRC=$GSDLHOME/bin/$GSDLOS/wgetrc
+
+if [ "x$JAVA_TOOL_OPTIONS" = "x" ] ; then
+    export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
+else
+    export JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8
+fi

main/trunk/greenstone2/setup.bat

@@ -308 +308 @@
 :: in build.xml
 ::
-::set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
-set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
+:: https://stackoverflow.com/questions/37071353/how-to-check-if-a-variable-exists-in-a-batch-file
+if "x%JAVA_TOOL_OPTIONS%"=="x" ( 
+   set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8  
+) else (
+  set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
+)