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

Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1

Browse source 
Former-commit-id: 933384a7ace268be2c267c7dd630dee6d1d42fd0
This commit is contained in:
Nate Jensen 2014-06-30 16:21:09 -05:00 • committed by Gerrit Code Review
commit 63bc6ed372
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
) &