Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7 Former-commit-id:48249301fc
[formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453] Former-commit-id:bca39f8b39
This commit is contained in:
parent
bcffac8875
commit
d72b56b988
1 changed files with 3 additions and 3 deletions
|
@ -47,7 +47,7 @@ JAVA_INSTALL="/awips2/java"
|
||||||
PYTHON_INSTALL="/awips2/python"
|
PYTHON_INSTALL="/awips2/python"
|
||||||
export AWIPS_INSTALL_DIR="${CAVE_INSTALL}"
|
export AWIPS_INSTALL_DIR="${CAVE_INSTALL}"
|
||||||
|
|
||||||
MAX_MEM_PROPORTION="0.9"
|
MAX_MEM_PROPORTION="0.85"
|
||||||
|
|
||||||
source ${CAVE_INSTALL}/caveUtil.sh
|
source ${CAVE_INSTALL}/caveUtil.sh
|
||||||
RC=$?
|
RC=$?
|
||||||
|
@ -241,9 +241,9 @@ curTime=`date +%Y%m%d_%H%M%S`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${redirect}" == "true" ]] ; then
|
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
|
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
|
fi
|
||||||
) &
|
) &
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue