Changeset 34099


Ignore:
Timestamp:
2020-04-09T11:32:58+12:00 (18 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bash

    r32205 r34099  
    408408# https://www.gnu.org/software/wget/manual/html_node/Wgetrc-Location.html
    409409export WGETRC=$GSDLHOME/bin/$GSDLOS/wgetrc
     410
     411if [ "x$JAVA_TOOL_OPTIONS" = "x" ] ; then
     412    export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
     413else
     414    export JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8
     415fi
  • main/trunk/greenstone2/setup.bat

    r34098 r34099  
    308308:: in build.xml
    309309::
    310 ::set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
    311 set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
     310:: https://stackoverflow.com/questions/37071353/how-to-check-if-a-variable-exists-in-a-batch-file
     311if "x%JAVA_TOOL_OPTIONS%"=="x" (
     312   set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 
     313) else (
     314  set JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Dfile.encoding=UTF-8
     315)
Note: See TracChangeset for help on using the changeset viewer.