Author: markt Date: Thu Jul 5 08:43:58 2018 New Revision: 1835107 URL: http://svn.apache.org/viewvc?rev=1835107&view=rev Log: Revert r1835090
Modified: tomcat/trunk/bin/catalina.sh tomcat/trunk/bin/ciphers.sh tomcat/trunk/bin/configtest.sh tomcat/trunk/bin/daemon.sh tomcat/trunk/bin/digest.sh tomcat/trunk/bin/makebase.sh tomcat/trunk/bin/setclasspath.sh tomcat/trunk/bin/shutdown.sh tomcat/trunk/bin/startup.sh tomcat/trunk/bin/tool-wrapper.sh tomcat/trunk/bin/version.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Jul 5 08:43:58 2018 @@ -112,7 +112,7 @@ cygwin=false darwin=false os400=false hpux=false -case "$(uname)" in +case "`uname`" in CYGWIN*) cygwin=true;; Darwin*) darwin=true;; OS400*) os400=true;; @@ -123,20 +123,20 @@ esac PRG="$0" while [ -h "$PRG" ]; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done # Get standard environment variables -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` # Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=$(cd "$PRGDIR/.." >/dev/null; pwd) +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` # Copy CATALINA_BASE from CATALINA_HOME if not already set [ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME" @@ -153,11 +153,11 @@ fi # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$JRE_HOME" ] && JRE_HOME=$(cygpath --unix "$JRE_HOME") - [ -n "$CATALINA_HOME" ] && CATALINA_HOME=$(cygpath --unix "$CATALINA_HOME") - [ -n "$CATALINA_BASE" ] && CATALINA_BASE=$(cygpath --unix "$CATALINA_BASE") - [ -n "$CLASSPATH" ] && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` + [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` + [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi # Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon @@ -228,19 +228,19 @@ fi # Bugzilla 37848: When no TTY is available, don't output to console have_tty=0 -if [ "$(tty)" != "not a tty" ]; then +if [ "`tty`" != "not a tty" ]; then have_tty=1 fi # For Cygwin, switch paths to Windows format before running java if $cygwin; then - JAVA_HOME=$(cygpath --absolute --windows "$JAVA_HOME") - JRE_HOME=$(cygpath --absolute --windows "$JRE_HOME") - CATALINA_HOME=$(cygpath --absolute --windows "$CATALINA_HOME") - CATALINA_BASE=$(cygpath --absolute --windows "$CATALINA_BASE") - CATALINA_TMPDIR=$(cygpath --absolute --windows "$CATALINA_TMPDIR") - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=$(cygpath --path --windows "$JAVA_ENDORSED_DIRS") + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` + CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` + CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` + CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` fi if [ -z "$JSSE_OPTS" ] ; then @@ -285,7 +285,7 @@ if [ -d "$CATALINA_HOME/endorsed" ]; the fi # Make the umask available when using the org.apache.catalina.security.SecurityListener -JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=$(umask)" +JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`" if [ -z "$USE_NOHUP" ]; then if $hpux; then @@ -407,7 +407,7 @@ elif [ "$1" = "start" ] ; then if [ -s "$CATALINA_PID" ]; then echo "Existing PID file found during start." if [ -r "$CATALINA_PID" ]; then - PID=$(cat "$CATALINA_PID") + PID=`cat "$CATALINA_PID"` ps -p $PID >/dev/null 2>&1 if [ $? -eq 0 ] ; then echo "Tomcat appears to still be running with PID $PID. Start aborted." @@ -500,7 +500,7 @@ elif [ "$1" = "stop" ] ; then if [ ! -z "$CATALINA_PID" ]; then if [ -f "$CATALINA_PID" ]; then if [ -s "$CATALINA_PID" ]; then - kill -0 $(cat "$CATALINA_PID") >/dev/null 2>&1 + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 if [ $? -gt 0 ]; then echo "PID file found but either no matching process was found or the current user does not have permission to stop the process. Stop aborted." exit 1 @@ -526,14 +526,14 @@ elif [ "$1" = "stop" ] ; then if [ $? != 0 ]; then if [ ! -z "$CATALINA_PID" ]; then echo "The stop command failed. Attempting to signal the process to stop through OS signal." - kill -15 $(cat "$CATALINA_PID") >/dev/null 2>&1 + kill -15 `cat "$CATALINA_PID"` >/dev/null 2>&1 fi fi if [ ! -z "$CATALINA_PID" ]; then if [ -f "$CATALINA_PID" ]; then while [ $SLEEP -ge 0 ]; do - kill -0 $(cat "$CATALINA_PID") >/dev/null 2>&1 + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 if [ $? -gt 0 ]; then rm -f "$CATALINA_PID" >/dev/null 2>&1 if [ $? != 0 ]; then @@ -557,9 +557,9 @@ elif [ "$1" = "stop" ] ; then echo "PID file was not removed." fi echo "To aid diagnostics a thread dump has been written to standard out." - kill -3 $(cat "$CATALINA_PID") + kill -3 `cat "$CATALINA_PID"` fi - SLEEP=$(expr $SLEEP - 1) + SLEEP=`expr $SLEEP - 1 ` done fi fi @@ -570,11 +570,11 @@ elif [ "$1" = "stop" ] ; then echo "Kill failed: \$CATALINA_PID not set" else if [ -f "$CATALINA_PID" ]; then - PID=$(cat "$CATALINA_PID") + PID=`cat "$CATALINA_PID"` echo "Killing Tomcat with the PID: $PID" kill -9 $PID while [ $KILL_SLEEP_INTERVAL -ge 0 ]; do - kill -0 $(cat "$CATALINA_PID") >/dev/null 2>&1 + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 if [ $? -gt 0 ]; then rm -f "$CATALINA_PID" >/dev/null 2>&1 if [ $? != 0 ]; then @@ -590,7 +590,7 @@ elif [ "$1" = "stop" ] ; then if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then sleep 1 fi - KILL_SLEEP_INTERVAL=$(expr $KILL_SLEEP_INTERVAL - 1) + KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 ` done if [ $KILL_SLEEP_INTERVAL -lt 0 ]; then echo "Tomcat has not been killed completely yet. The process might be waiting on some system call or might be UNINTERRUPTIBLE." Modified: tomcat/trunk/bin/ciphers.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/ciphers.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/ciphers.sh (original) +++ tomcat/trunk/bin/ciphers.sh Thu Jul 5 08:43:58 2018 @@ -21,7 +21,7 @@ # Better OS/400 detection: see Bugzilla 31132 os400=false -case "$(uname)" in +case "`uname`" in OS400*) os400=true;; esac @@ -29,16 +29,16 @@ esac PRG="$0" while [ -h "$PRG" ] ; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` EXECUTABLE=tool-wrapper.sh # Check that target executable exists Modified: tomcat/trunk/bin/configtest.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/configtest.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/configtest.sh (original) +++ tomcat/trunk/bin/configtest.sh Thu Jul 5 08:43:58 2018 @@ -21,7 +21,7 @@ # Better OS/400 detection: see Bugzilla 31132 os400=false -case "$(uname)" in +case "`uname`" in OS400*) os400=true;; esac @@ -29,16 +29,16 @@ esac PRG="$0" while [ -h "$PRG" ] ; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` EXECUTABLE=catalina.sh # Check that target executable exists Modified: tomcat/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/daemon.sh (original) +++ tomcat/trunk/bin/daemon.sh Thu Jul 5 08:43:58 2018 @@ -22,16 +22,16 @@ # resolve links - $0 may be a softlink ARG0="$0" while [ -h "$ARG0" ]; do - ls=$(ls -ld "$ARG0") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$ARG0"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then ARG0="$link" else - ARG0="$(dirname $ARG0)/$link" + ARG0="`dirname $ARG0`/$link" fi done -DIRNAME="$(dirname $ARG0)" -PROGRAM="$(basename $ARG0)" +DIRNAME="`dirname $ARG0`" +PROGRAM="`basename $ARG0`" while [ ".$1" != . ] do case "$1" in @@ -73,7 +73,7 @@ done # OS specific support (must be 'true' or 'false'). cygwin=false; darwin=false; -case "$(uname)" in +case "`uname`" in CYGWIN*) cygwin=true ;; @@ -93,24 +93,24 @@ test ".$TOMCAT_USER" = . && TOMCAT_USER= # from java binary if on the PATH # if [ -z "$JAVA_HOME" ]; then - JAVA_BIN="$(which java 2>/dev/null || type java 2>&1)" + JAVA_BIN="`which java 2>/dev/null || type java 2>&1`" while [ -h "$JAVA_BIN" ]; do - ls=$(ls -ld "$JAVA_BIN") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$JAVA_BIN"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then JAVA_BIN="$link" else - JAVA_BIN="$(dirname $JAVA_BIN)/$link" + JAVA_BIN="`dirname $JAVA_BIN`/$link" fi done - test -x "$JAVA_BIN" && JAVA_HOME="$(dirname $JAVA_BIN)" - test ".$JAVA_HOME" != . && JAVA_HOME=$(cd "$JAVA_HOME/.." >/dev/null; pwd) + test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`" + test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd` else JAVA_BIN="$JAVA_HOME/bin/java" fi # Only set CATALINA_HOME if not already set -test ".$CATALINA_HOME" = . && CATALINA_HOME=$(cd "$DIRNAME/.." >/dev/null; pwd) +test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap # If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME @@ -165,11 +165,11 @@ test ".$CATALINA_PID" = . && CATALINA_PI # Increase the maximum file descriptors if we can if [ "$cygwin" = "false" ]; then - MAX_FD_LIMIT=$(ulimit -H -n) + 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 - MAX_FD_LIMIT=$(/usr/sbin/sysctl -n kern.maxfilesperproc) + MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc` fi test ".$MAX_FD" = ".maximum" && MAX_FD="$MAX_FD_LIMIT" ulimit -n $MAX_FD Modified: tomcat/trunk/bin/digest.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/digest.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/digest.sh (original) +++ tomcat/trunk/bin/digest.sh Thu Jul 5 08:43:58 2018 @@ -21,7 +21,7 @@ # Better OS/400 detection: see Bugzilla 31132 os400=false -case "$(uname)" in +case "`uname`" in OS400*) os400=true;; esac @@ -29,16 +29,16 @@ esac PRG="$0" while [ -h "$PRG" ] ; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` EXECUTABLE=tool-wrapper.sh # Check that target executable exists Modified: tomcat/trunk/bin/makebase.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/makebase.sh (original) +++ tomcat/trunk/bin/makebase.sh Thu Jul 5 08:43:58 2018 @@ -29,20 +29,20 @@ PRG="$0" while [ -h "$PRG" ]; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done # Get standard environment variables -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` # Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=$(cd "$PRGDIR/.." >/dev/null; pwd) +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` # first arg is the target directory BASE_TGT=$1 Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Thu Jul 5 08:43:58 2018 @@ -26,16 +26,16 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ] if $darwin; then # Bugzilla 54390 if [ -x '/usr/libexec/java_home' ] ; then - export JAVA_HOME=$(/usr/libexec/java_home) + export JAVA_HOME=`/usr/libexec/java_home` # Bugzilla 37284 (reviewed). elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" fi else - JAVA_PATH=$(which java 2>/dev/null) + JAVA_PATH=`which java 2>/dev/null` if [ "x$JAVA_PATH" != "x" ]; then - JAVA_PATH=$(dirname $JAVA_PATH 2>/dev/null) - JRE_HOME=$(dirname $JAVA_PATH 2>/dev/null) + JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null` + JRE_HOME=`dirname $JAVA_PATH 2>/dev/null` fi if [ "x$JRE_HOME" = "x" ]; then # XXX: Should we try other locations? Modified: tomcat/trunk/bin/shutdown.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/shutdown.sh (original) +++ tomcat/trunk/bin/shutdown.sh Thu Jul 5 08:43:58 2018 @@ -21,7 +21,7 @@ # Better OS/400 detection: see Bugzilla 31132 os400=false -case "$(uname)" in +case "`uname`" in OS400*) os400=true;; esac @@ -29,16 +29,16 @@ esac PRG="$0" while [ -h "$PRG" ] ; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` EXECUTABLE=catalina.sh # Check that target executable exists Modified: tomcat/trunk/bin/startup.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/startup.sh (original) +++ tomcat/trunk/bin/startup.sh Thu Jul 5 08:43:58 2018 @@ -21,7 +21,7 @@ # Better OS/400 detection: see Bugzilla 31132 os400=false -case "$(uname)" in +case "`uname`" in OS400*) os400=true;; esac @@ -29,16 +29,16 @@ esac PRG="$0" while [ -h "$PRG" ] ; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` EXECUTABLE=catalina.sh # Check that target executable exists Modified: tomcat/trunk/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/tool-wrapper.sh (original) +++ tomcat/trunk/bin/tool-wrapper.sh Thu Jul 5 08:43:58 2018 @@ -45,7 +45,7 @@ cygwin=false darwin=false os400=false -case "$(uname)" in +case "`uname`" in CYGWIN*) cygwin=true;; Darwin*) darwin=true;; OS400*) os400=true;; @@ -55,20 +55,20 @@ esac PRG="$0" while [ -h "$PRG" ]; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done # Get standard environment variables -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` # Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=$(cd "$PRGDIR/.." >/dev/null; pwd) +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` # Ensure that any user defined CLASSPATH variables are not used on startup, # but allow them to be specified in setenv.sh, in rare case when it is needed. @@ -80,10 +80,10 @@ fi # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$JRE_HOME" ] && JRE_HOME=$(cygpath --unix "$JRE_HOME") - [ -n "$CATALINA_HOME" ] && CATALINA_HOME=$(cygpath --unix "$CATALINA_HOME") - [ -n "$CLASSPATH" ] && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` + [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi # For OS400 @@ -123,11 +123,11 @@ CLASSPATH="$CLASSPATH""$CATALINA_HOME"/b # For Cygwin, switch paths to Windows format before running java if $cygwin; then - JAVA_HOME=$(cygpath --absolute --windows "$JAVA_HOME") - JRE_HOME=$(cygpath --absolute --windows "$JRE_HOME") - CATALINA_HOME=$(cygpath --absolute --windows "$CATALINA_HOME") - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - JAVA_ENDORSED_DIRS=$(cygpath --path --windows "$JAVA_ENDORSED_DIRS") + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` + CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` fi # Java 9 no longer supports the java.endorsed.dirs Modified: tomcat/trunk/bin/version.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/version.sh?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/bin/version.sh (original) +++ tomcat/trunk/bin/version.sh Thu Jul 5 08:43:58 2018 @@ -21,7 +21,7 @@ # Better OS/400 detection: see Bugzilla 31132 os400=false -case "$(uname)" in +case "`uname`" in OS400*) os400=true;; esac @@ -29,16 +29,16 @@ esac PRG="$0" while [ -h "$PRG" ] ; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=$(dirname "$PRG")/"$link" + PRG=`dirname "$PRG"`/"$link" fi done -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` EXECUTABLE=catalina.sh # Check that target executable exists Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1835107&r1=1835106&r2=1835107&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 5 08:43:58 2018 @@ -111,10 +111,6 @@ Implement checksum checks when downloading dependencies that are used to build Tomcat. (kkolinko) </add> - <scode> - Update the shell scripts to consistently use <code>$(...)</code> rather - than <code>`...`</code>. (markt) - </scode> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org