This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 378324f453aea8e5068b0a825d3548c15b34e2f1 Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Jul 24 18:25:10 2019 +0100 Align with 8.5.x. Apply shellcheck.net recommendations for portability --- bin/daemon.sh | 2 +- bin/setclasspath.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/daemon.sh b/bin/daemon.sh index 0e8888b..afa4c89 100755 --- a/bin/daemon.sh +++ b/bin/daemon.sh @@ -170,7 +170,7 @@ if [ "$cygwin" = "false" ]; then MAX_FD_LIMIT=`ulimit -H -n` if [ "$?" -eq 0 ]; then # Darwin does not allow RLIMIT_INFINITY on file soft limit - if [ "$darwin" = "true" -a "$MAX_FD_LIMIT" = "unlimited" ]; then + if [ "$darwin" = "true" ] && [ "$MAX_FD_LIMIT" = "unlimited" ]; then MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc` fi test ".$MAX_FD" = ".maximum" && MAX_FD="$MAX_FD_LIMIT" diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh index fed6c5d..4ae4b6a 100755 --- a/bin/setclasspath.sh +++ b/bin/setclasspath.sh @@ -22,7 +22,7 @@ # ----------------------------------------------------------------------------- # Make sure prerequisite environment variables are set -if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then +if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOME" ]; then if $darwin; then # Bugzilla 54390 if [ -x '/usr/libexec/java_home' ] ; then @@ -44,13 +44,13 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then fi fi fi - if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then + if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOME" ]; then echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" echo "At least one of these environment variable is needed to run this program" exit 1 fi fi -if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then +if [ -z "$JAVA_HOME" ] && [ "$1" = "debug" ]; then echo "JAVA_HOME should point to a JDK in order to run in debug mode." exit 1 fi @@ -61,14 +61,14 @@ fi # If we're running under jdb, we need a full jdk. if [ "$1" = "debug" ] ; then if [ "$os400" = "true" ]; then - if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then + if [ ! -x "$JAVA_HOME"/bin/java ] || [ ! -x "$JAVA_HOME"/bin/javac ]; then echo "The JAVA_HOME environment variable is not defined correctly" echo "This environment variable is needed to run this program" echo "NB: JAVA_HOME should point to a JDK not a JRE" exit 1 fi else - if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then + if [ ! -x "$JAVA_HOME"/bin/java ] || [ ! -x "$JAVA_HOME"/bin/jdb ] || [ ! -x "$JAVA_HOME"/bin/javac ]; then echo "The JAVA_HOME environment variable is not defined correctly" echo "This environment variable is needed to run this program" echo "NB: JAVA_HOME should point to a JDK not a JRE" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org