xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #3245 fix detection of correct ini file

Browse source 
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7

Former-commit-id: e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]]
Former-commit-id: 48249301fc
Former-commit-id: 4dd144d873 [formerly 0f0e890fce] [formerly c525443c556f5d3c4e3585bc6ee865de49c0fa07 [formerly 1d6912b4dd]]
Former-commit-id: 8838747449e3a1b1a8d2c17d9a358b4e5376a19f [formerly 635e902b80]
Former-commit-id: d189ad3b7a
This commit is contained in:
Nate Jensen 2014-06-30 15:53:41 -05:00
parent c2835d25ac
commit be7402f054
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/build/static/linux/cave/cave.sh
View file

@ -47,7 +47,7 @@ JAVA_INSTALL="/awips2/java"
PYTHON_INSTALL="/awips2/python"
export AWIPS_INSTALL_DIR="${CAVE_INSTALL}"
MAX_MEM_PROPORTION="0.9"
MAX_MEM_PROPORTION="0.85"
source ${CAVE_INSTALL}/caveUtil.sh
RC=$?
@ -241,9 +241,9 @@ curTime=`date +%Y%m%d_%H%M%S`
fi
if [[ "${redirect}" == "true" ]] ; then
exec ${CAVE_INSTALL}/cave ${SWITCHES} "${CAVE_INI_ARG}" "${USER_ARGS[@]}" > ${LOGFILE} 2>&1
exec ${CAVE_INSTALL}/cave ${CAVE_INI_ARG} ${SWITCHES} "${USER_ARGS[@]}" > ${LOGFILE} 2>&1
else
exec ${CAVE_INSTALL}/cave ${SWITCHES} "${CAVE_INI_ARG}" "${USER_ARGS[@]}" 2>&1 | tee ${LOGFILE}
exec ${CAVE_INSTALL}/cave ${CAVE_INI_ARG} ${SWITCHES} "${USER_ARGS[@]}" 2>&1 | tee ${LOGFILE}
fi
) &