Author: markt
Date: Thu Jul 5 09:31:55 2018
New Revision: 1835114
URL: http://svn.apache.org/viewvc?rev=1835114&view=rev
Log:
Remove unnecessary use of ${...} for consistency with other scripts.
Modified:
tomcat/trunk/bin/daemon.sh
tomcat/trunk/bin/makebase.sh
Modified: tomcat/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1835114&r1=1835113&r2=1835114&view=diff
==============================================================================
--- tomcat/trunk/bin/daemon.sh (original)
+++ tomcat/trunk/bin/daemon.sh Thu Jul 5 09:31:55 2018
@@ -134,7 +134,7 @@ elif [ -r "$CATALINA_HOME/bin/setenv.sh"
fi
# Add on extra jar files to CLASSPATH
-test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
+test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:"
CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
test ".$CATALINA_OUT" = . &&
CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
Modified: tomcat/trunk/bin/makebase.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1835114&r1=1835113&r2=1835114&view=diff
==============================================================================
--- tomcat/trunk/bin/makebase.sh (original)
+++ tomcat/trunk/bin/makebase.sh Thu Jul 5 09:31:55 2018
@@ -47,37 +47,37 @@ PRGDIR=`dirname "$PRG"`
# first arg is the target directory
BASE_TGT=$1
-if [ -z ${BASE_TGT} ]; then
+if [ -z $BASE_TGT ]; then
# target directory not provided; exit
echo "Usage: makebase <path-to-target-directory>"
exit 1
fi
-if [ -d ${BASE_TGT} ]; then
+if [ -d $BASE_TGT ]; then
# target directory exists
echo "Target directory exists"
# exit if target directory is not empty
- [ "`ls -A ${BASE_TGT}`" ] && \
+ [ "`ls -A $BASE_TGT`" ] && \
echo "Target directory is not empty" && \
exit 1
else
# create the target directory
- mkdir -p ${BASE_TGT}
+ mkdir -p $BASE_TGT
fi
for dir in bin lib logs temp webapps work;
do
# create empty directories
- mkdir "${BASE_TGT}/${dir}"
+ mkdir "$BASE_TGT/$dir"
done
# copy conf directory recursively and preserve permissions
-cp -a "${CATALINA_HOME}/conf" "${BASE_TGT}/"
+cp -a "$CATALINA_HOME/conf" "$BASE_TGT/"
# copy setenv.sh if exists
-[ -f "${CATALINA_HOME}/bin/setenv.sh" ] && \
- cp "${CATALINA_HOME}/bin/setenv.sh" "${BASE_TGT}/bin/"
+[ -f "$CATALINA_HOME/bin/setenv.sh" ] && \
+ cp "$CATALINA_HOME/bin/setenv.sh" "$BASE_TGT/bin/"
echo "Created CATALINA_BASE directory at $BASE_TGT"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
