Author: markt
Date: Mon Jul 7 15:32:14 2014
New Revision: 1608490
URL: http://svn.apache.org/r1608490
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56685
Add quotes necessary for <code>daemon.sh</code> to work correctly on Solaris.
Based on a suggesiton by lfuka.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/daemon.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1608481
Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1608490&r1=1608489&r2=1608490&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/daemon.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/daemon.sh Mon Jul 7 15:32:14 2014
@@ -105,9 +105,9 @@ test ".$CATALINA_HOME" = . && CATALINA_H
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
-if [ -z $JSVC ]; then
+if [ -z "$JSVC" ]; then
JSVC="$CATALINA_BASE/bin/jsvc"
- if [ ! -x $JSVC ]; then
+ if [ ! -x "$JSVC" ]; then
JSVC="$CATALINA_HOME/bin/jsvc"
fi
fi
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1608490&r1=1608489&r2=1608490&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 7 15:32:14 2014
@@ -253,6 +253,10 @@
<update>
Update optional Checkstyle library to 5.7. (kkolinko)
</update>
+ <fix>
+ <bug>56685</bug>: Add quotes necessary for <code>daemon.sh</code> to
+ work correctly on Solaris. Based on a suggesiton by lfuka. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
