[Pkg-mono-svn-commits] rev 308 - xsp-snapshot/trunk/debian/official

[Pablo Fischer]

Author: pabl0-guest
Date: 2004-02-19 07:07:29 +0100 (Thu, 19 Feb 2004)
New Revision: 308

Modified:
   xsp-snapshot/trunk/debian/official/mono-server.init
   xsp-snapshot/trunk/debian/official/mono-xsp.init
Log:
Removed the should_stop and fixed some bugs 


Modified: xsp-snapshot/trunk/debian/official/mono-server.init
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-server.init	2004-02-19 06:06:39 UTC (rev 307)
+++ xsp-snapshot/trunk/debian/official/mono-server.init	2004-02-19 06:07:29 UTC (rev 308)
@@ -18,9 +18,13 @@
 
 prepare_socket() {
     . $DEFAULT
-    if [ -d /tmp/.mono-server ]; then
+    if [ ! -d /tmp/.mono-server ]; then
         mkdir /tmp/.mono-server
     fi
+
+    if [ -e $socket_file ]; then
+	rm -Rf $socket_file
+    fi
 }
 
 fix_privileges() {
@@ -41,42 +45,32 @@
         exit 0
     fi
 
-    if [ -e $VIRTUALFILE ]; then
+    if [ ! -e $VIRTUALFILE ]; then
 	echo "You dont have $VIRTUALFILE "
 	echo "To have it, you need to install at least one package for xsp (like asp.net-examples)"	
 	exit 0
     fi
 
-    if [ -e /var/run/$NAME ]; then
-	echo "$NAME is already running, you could restart it (restart)"
-	exit 0
-    fi
+    prepare_socket
 }
 
 
-should_stop() {
-    if [ ! -e /var/run/$NAME ]; then
-	echo "Sorry, $NAME is not running.."
-	exit 0
-    fi
-}
-
 set -e
 
 case "$1" in
   start)
 	should_start
-	virtual_dirs=`echo $(cat $VIRTUALFILE | tr '\n' , | sed 's/.$//')`
+	virtual_dirs=`echo $(cat $VIRTUALFILE | grep -v '#' | tr '\n' , | sed 's/.$//')`
 	. $DEFAULT
 	echo -n "Starting $DESC: $NAME"
 	start-stop-daemon --start --background --make-pidfile \
 	    --quiet --pidfile /var/run/$NAME.pid \
 	    --exec $DAEMON -- --applications $virtual_dirs --filename $socket_file --nonstop	
 	echo "."
+	sleep 2
 	fix_privileges
 	;;
   stop)
-	should_stop
 	echo -n "Stopping $DESC: $NAME "
 	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid 		
 	echo "."
@@ -100,19 +94,19 @@
 	#	option to the "reload" entry above. If not, "force-reload" is
 	#	just the same as "restart".
 	#
-  	should_stop	
 	echo -n "Restarting $DESC: $NAME"
 	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
 	sleep 1
 	
 	should_start
 
-	virtual_dirs=`echo $(cat $VIRTUALFILE | tr '\n' , | sed 's/.$//')`
+	virtual_dirs=`echo $(cat $VIRTUALFILE | grep -v '#' | tr '\n' , | sed 's/.$//')`
 	. $DEFAULT	
 	start-stop-daemon --start --background --make-pidfile \
 	    --quiet --pidfile /var/run/$NAME.pid \
 	    --exec $DAEMON -- --applications $virtual_dirs --filename $socket_file --nonstop	
 	echo "."
+	sleep 2
 	fix_privileges
 	;;
   *)

Modified: xsp-snapshot/trunk/debian/official/mono-xsp.init
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-xsp.init	2004-02-19 06:06:39 UTC (rev 307)
+++ xsp-snapshot/trunk/debian/official/mono-xsp.init	2004-02-19 06:07:29 UTC (rev 308)
@@ -36,24 +36,12 @@
 	exit 0
     fi
 
-    if [ -e /var/run/$NAME ]; then
-	echo "$NAME is already running, you could restart it (restart)"
-	exit 0
-    fi
 }
 
-should_stop() {
-    if [ ! -e /var/run/$NAME ]; then
-	echo "Sorry, $NAME is not running.."
-	exit 0
-    fi
-}
-	
-
 case "$1" in
     start)
 	should_start
-	virtual_dirs=`echo $(cat $VIRTUALFILE | tr '\n' , | sed 's/.$//')`
+	virtual_dirs=`echo $(cat $VIRTUALFILE | grep -v '#' | tr '\n' , | sed 's/.$//')`
 	. $DEFAULT	
 	echo -n "Starting $DESC: $NAME"
 	start-stop-daemon --start --background --make-pidfile \
@@ -63,7 +51,6 @@
 	echo "."
 	;;
     stop)
-	should_stop
 	echo -n "Stopping $DESC: $NAME "
 	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME
 	echo "."
@@ -74,13 +61,12 @@
 	#	option to the "reload" entry above. If not, "force-reload" is
 	#	just the same as "restart".
 	#
-	should_stop
 	echo -n "Restarting $DESC: $NAME"
 	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME
 	sleep 1
 
 	should_start
-	virtual_dirs=`echo $(cat $VIRTUALFILE | tr '\n' , | sed 's/.$//')`
+	virtual_dirs=`echo $(cat $VIRTUALFILE | grep -v '#' | tr '\n' , | sed 's/.$//')`
 	. $DEFAULT	
 	echo "Starting $DESC: $NAME"
 	start-stop-daemon --start --background --make-pidfile \