packages: red5/red5 - $(< is bashism - fix overquoting - pid can be empty, ...

[glen]

Author: glen                         Date: Wed Oct 28 17:47:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- $(< is bashism
- fix overquoting
- pid can be empty, more signals to trap
- allow possible spaces in *_OPTS to be passed on
- typo in classpath setup
- more notes

---- Files affected:
packages/red5:
   red5 (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/red5/red5
diff -u packages/red5/red5:1.6 packages/red5/red5:1.7
--- packages/red5/red5:1.6	Wed Oct 28 18:40:41 2009
+++ packages/red5/red5	Wed Oct 28 18:47:48 2009
@@ -1,34 +1,38 @@
-#!/bin/sh -x
+#!/bin/sh
 
 if [ -f /var/run/red5/red5.pid ]; then
-  echo "Pid file exists."
-  exit
+	echo >&2 "PID file exists."
+	exit 1
 fi
 
 # set $JAVACMD
 . /usr/share/java-utils/java-functions
 set_javacmd
 
-export RED5_HOME=${RED5_HOME:-"/usr/share/red5"}
-export RED5_WEBAPPSDIR=${RED5_WEBAPPSDIR:-"/var/lib/red5/webapps"}
-export RED5_CLASSPATH="${RED5_CLASSPATH:+"RED5_CLASSPATH:"}$RED5_HOME/boot.jar:/etc/red5"
+export RED5_HOME=${RED5_HOME:-/usr/share/red5}
+export RED5_WEBAPPSDIR=${RED5_WEBAPPSDIR:-/var/lib/red5/webapps}
+export RED5_CLASSPATH=$RED5_CLASSPATH${RED5_CLASSPATH:+}$RED5_HOME/boot.jar:/etc/red5
 
 LOGGING_OPTS="-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true"
 SECURITY_OPTS="-Djava.security.debug=failure"
-JAVA_OPTS="$JAVA_OPTS $LOGGING_OPTS $SECURITY_OPTS"
 
-trap 'kill $(< /var/run/red5/red5.pid)' TERM
+trap 'pid=$(cat /var/run/red5/red5.pid 2>/dev/null); [ "$pid" ] && kill $pid' TERM INT EXIT
 
 # start red5
-cd /usr/share/red5
+cd "$RED5_HOME"
 $JAVACMD \
 	$JAVA_OPTS \
+	$LOGGING_OPTS \
+	$SECURITY_OPTS \
 	-Dpython.home=$RED5_HOME/lib \
 	-Dred5.root=$RED5_HOME \
 	-Dred5.webappsdir=$RED5_WEBAPPSDIR \
-	-cp $RED5_CLASSPATH org.red5.server.Bootstrap "$@" > /var/log/red5/red5.out &
+	-cp $RED5_CLASSPATH org.red5.server.Bootstrap "$@" >> /var/log/red5/red5.out &
+
+PID=$!
+
+# XXX: what happens if $JAVACMD fails and $PID is empty?
 
-PID="$!"
 echo "$PID" > /var/run/red5/red5.pid
 wait $PID
 rm /var/run/red5/red5.pid
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/red5/red5?r1=1.6&r2=1.7&f=u