From 931bbbb0b17c06290ff94948ed0a2837c3fbfdea Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 6 Mar 2020 13:48:51 +0000 Subject: [PATCH] Allow --javamaxmem as well as -javamaxmem (same for --javastack). This is consistent with all other switches in PRISM, but these are handled separately, in the launch shell scripts, so have to be detected there. --- prism/src/bin/prism.cygwin | 4 ++-- prism/src/bin/prism.darwin32 | 4 ++-- prism/src/bin/prism.darwin64 | 4 ++-- prism/src/bin/prism.linux | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin index 03494f5c..b0fb7c82 100644 --- a/prism/src/bin/prism.cygwin +++ b/prism/src/bin/prism.cygwin @@ -15,7 +15,7 @@ fi # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM ARGS=( "$@" ) for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javamaxmem" ]; then + if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then PRISM_JAVAMAXMEM=${ARGS[$i+1]} PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then @@ -40,7 +40,7 @@ fi # If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javastack" ]; then + if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then PRISM_JAVASTACKSIZE=${ARGS[$i+1]} PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVASTACKSIZE" = "" ]; then diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32 index edca3a53..3d313072 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -21,7 +21,7 @@ fi # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM ARGS=( "$@" ) for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javamaxmem" ]; then + if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then PRISM_JAVAMAXMEM=${ARGS[$i+1]} PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then @@ -46,7 +46,7 @@ fi # If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javastack" ]; then + if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then PRISM_JAVASTACKSIZE=${ARGS[$i+1]} PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVASTACKSIZE" = "" ]; then diff --git a/prism/src/bin/prism.darwin64 b/prism/src/bin/prism.darwin64 index edca3a53..3d313072 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -21,7 +21,7 @@ fi # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM ARGS=( "$@" ) for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javamaxmem" ]; then + if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then PRISM_JAVAMAXMEM=${ARGS[$i+1]} PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then @@ -46,7 +46,7 @@ fi # If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javastack" ]; then + if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then PRISM_JAVASTACKSIZE=${ARGS[$i+1]} PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVASTACKSIZE" = "" ]; then diff --git a/prism/src/bin/prism.linux b/prism/src/bin/prism.linux index 54d591a4..3577f438 100755 --- a/prism/src/bin/prism.linux +++ b/prism/src/bin/prism.linux @@ -15,7 +15,7 @@ fi # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM ARGS=( "$@" ) for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javamaxmem" ]; then + if [ "${ARGS[$i]}" = "-javamaxmem" -o "${ARGS[$i]}" = "--javamaxmem" ]; then PRISM_JAVAMAXMEM=${ARGS[$i+1]} PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then @@ -40,7 +40,7 @@ fi # If there is a -javastack switch, use it for PRISM_JAVASTACKSIZE for ((i=0;i<${#ARGS[@]};i+=1)); do - if [ "${ARGS[$i]}" = "-javastack" ]; then + if [ "${ARGS[$i]}" = "-javastack" -o "${ARGS[$i]}" = "--javastack" ]; then PRISM_JAVASTACKSIZE=${ARGS[$i+1]} PRISM_JAVASTACKSIZE=`echo "$PRISM_JAVASTACKSIZE" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVASTACKSIZE" = "" ]; then