Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id:b544abb498
[formerlybaec32be20
] [formerlyb544abb498
[formerlybaec32be20
] [formerly23c5ea21e4
[formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]] Former-commit-id:23c5ea21e4
Former-commit-id:3941281bb0
[formerly88afde5dfa
] Former-commit-id:fe4e43d8d3
This commit is contained in:
commit
f623152a9c
1 changed files with 2 additions and 8 deletions
|
@ -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=$?
|
||||
|
|
Loading…
Add table
Reference in a new issue