Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1

Former-commit-id: f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly 23c5ea21e4 [formerly baec32be20 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 015c694d2f [formerly 3941281bb0] [formerly 7e9e75b3708abb852b52c881df4127de3e856477 [formerly 88afde5dfa]]
Former-commit-id: 43e8eb44fa4a566ec838fb8744a8301569eb65d6 [formerly fe4e43d8d3]
Former-commit-id: f623152a9c
This commit is contained in:
Nate Jensen 2014-10-06 09:07:37 -05:00 committed by Gerrit Code Review
commit a7ed20921b

View file

@ -78,12 +78,6 @@ if [ ! -d $LOGDIR ]; then
mkdir -p $LOGDIR
fi
# Special instructions for the 64-bit jvm.
ARCH_ARGS=""
if [ -f /awips2/java/jre/lib/amd64/server/libjvm.so ]; then
ARCH_ARGS="-vm /awips2/java/jre/lib/amd64/server/libjvm.so"
fi
#run a loop for alertviz
count=0
while [ $exitVal -ne 0 -a $count -lt 10 ]
@ -105,9 +99,9 @@ do
else
#finally check if we can write to the file
if [ -w ${LOGFILE} ]; then
${dir}/alertviz ${ARCH_ARGS} $* > ${LOGFILE} 2>&1
${dir}/alertviz $* > ${LOGFILE} 2>&1
else
${dir}/alertviz ${ARCH_ARGS} $*
${dir}/alertviz $*
fi
fi
exitVal=$?