r1689 - in zope-debhelper/trunk/autoscripts (4 files)

[Jonas Meurer]

    Date: Sunday, August 9, 2009 @ 15:03:53
  Author: mejo
Revision: 1689

fix INVOKE to actually point to zope init script

Modified:
  zope-debhelper/trunk/autoscripts/postinst-dzinstance
  zope-debhelper/trunk/autoscripts/postrm-dzinstance
  zope-debhelper/trunk/autoscripts/preinst-dzinstance
  zope-debhelper/trunk/autoscripts/prerm-dzinstance

Modified: zope-debhelper/trunk/autoscripts/postinst-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/postinst-dzinstance	2009-08-09 14:22:48 UTC (rev 1688)
+++ zope-debhelper/trunk/autoscripts/postinst-dzinstance	2009-08-09 15:03:53 UTC (rev 1689)
@@ -13,7 +13,7 @@
 }
 
 if command -v invoke-rc.d >/dev/null 2>&1; then
-	INVOKE="invoke-rc.d"
+	INVOKE="invoke-rc.d zope$ZVER"
 else
 	INVOKE="/etc/init.d/zope$ZVER"
 fi
@@ -27,7 +27,7 @@
         echo "Zope$ZVER instance '$INSTANCE' already exists."
         add_products
 	if [ "$DATABASE" = "ZEO" ]; then
-            if ! "$INVOKE" start "ZEOSERVER=$INSTANCE"; then
+            if ! $INVOKE start "ZEOSERVER=$INSTANCE"; then
 	        echo "Could not start the zeo database which was"
 		echo "configured for the zope instance. Please"
 		echo "check for errors by running zeo by hand"
@@ -36,7 +36,7 @@
 	    fi
 	fi
 	if [ -z "$ZEOFAILURE" ]; then
-            if ! "$INVOKE" start "INSTANCE=$INSTANCE"; then
+            if ! $INVOKE start "INSTANCE=$INSTANCE"; then
                 echo "Could not start zope instance $INSTANCE. Please check"
                 echo "for errors running the instance by hand:"
                 echo "  /var/lib/zope$ZVER/instance/$INSTANCE/runzope"
@@ -70,7 +70,7 @@
             db_get $PKG/instance-zeo-port
             zeoport="$RET"
             dzhandle -z $ZVER make-zeoinstance $INSTANCE $zeoport
-            "$INVOKE" start "ZEOSERVER=$INSTANCE"
+            $INVOKE start "ZEOSERVER=$INSTANCE"
             ZEOSERVER="--zeo-server=localhost:$zeoport"
         else
             ZEOSERVER=""
@@ -85,7 +85,7 @@
             db_set $PKG/admin-password ""
             db_set $PKG/admin-password-confirmation ""
             add_products
-            if ! "$INVOKE" start "INSTANCE=$INSTANCE"; then
+            if ! $INVOKE start "INSTANCE=$INSTANCE"; then
                 echo "Could not start zope instance $INSTANCE. Please check"
                 echo "for errors running the instance by hand:"
                 echo "  /var/lib/zope$ZVER/instance/$INSTANCE/runzope"

Modified: zope-debhelper/trunk/autoscripts/postrm-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/postrm-dzinstance	2009-08-09 14:22:48 UTC (rev 1688)
+++ zope-debhelper/trunk/autoscripts/postrm-dzinstance	2009-08-09 15:03:53 UTC (rev 1689)
@@ -10,7 +10,7 @@
 [ -n "$(echo $INSTANCE)" ] || exit 1
 
 if command -v invoke-rc.d >/dev/null 2>&1; then
-	INVOKE="invoke-rc.d"
+	INVOKE="invoke-rc.d zope$ZVER"
 else
 	INVOKE="/etc/init.d/zope$ZVER"
 fi
@@ -23,10 +23,10 @@
     ;;
 
   remove)
-    /etc/init.d/zope$ZVER stop "INSTANCE=$INSTANCE" || true
+    $INVOKE zope$ZVER stop "INSTANCE=$INSTANCE" || true
     dzhandle -z $ZVER remove-instance $INSTANCE || true
     if [ "$DATABASE" = "ZEO" ]; then
-	"$INVOKE" zope$ZVER stop "ZEOSERVER=$INSTANCE" || true
+	$INVOKE zope$ZVER stop "ZEOSERVER=$INSTANCE" || true
         dzhandle -z $ZVER remove-zeoinstance $INSTANCE || true
     fi
     ;;

Modified: zope-debhelper/trunk/autoscripts/preinst-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/preinst-dzinstance	2009-08-09 14:22:48 UTC (rev 1688)
+++ zope-debhelper/trunk/autoscripts/preinst-dzinstance	2009-08-09 15:03:53 UTC (rev 1689)
@@ -4,7 +4,7 @@
 DATABASE=#DZ-DATABASE#
 
 if command -v invoke-rc.d >/dev/null 2>&1; then
-	INVOKE="invoke-rc.d"
+	INVOKE="invoke-rc.d zope$ZVER"
 else
 	INVOKE="/etc/init.d/zope$ZVER"
 fi
@@ -13,9 +13,9 @@
     install|upgrade)
 	if [ "$1" = "upgrade" ]; then
 	    if [ "$DATABASE" = "ZEO" ]; then
-		"$INVOKE" zope$ZVER stop "ZEOSERVER=$INSTANCE" || true
+		$INVOKE zope$ZVER stop "ZEOSERVER=$INSTANCE" || true
 	    fi
-	    "$INVOKE" zope$ZVER stop "INSTANCE=$INSTANCE" || true
+	    $INVOKE zope$ZVER stop "INSTANCE=$INSTANCE" || true
 	fi
 	;;
     failed-upgrade)

Modified: zope-debhelper/trunk/autoscripts/prerm-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/prerm-dzinstance	2009-08-09 14:22:48 UTC (rev 1688)
+++ zope-debhelper/trunk/autoscripts/prerm-dzinstance	2009-08-09 15:03:53 UTC (rev 1689)
@@ -6,7 +6,7 @@
 [ -n "$(echo $INSTANCE)" ] || exit 1
 
 if command -v invoke-rc.d >/dev/null 2>&1; then
-	INVOKE="invoke-rc.d"
+	INVOKE="invoke-rc.d zope$ZVER"
 else
 	INVOKE="/etc/init.d/zope$ZVER"
 fi
@@ -22,7 +22,7 @@
 case "$1" in
   remove|upgrade)
     if [ "$DATABASE" = "ZEO" ]; then
-	"$INVOKE" zope$ZVER stop "ZEOSERVER=$INSTANCE" || true
+	$INVOKE zope$ZVER stop "ZEOSERVER=$INSTANCE" || true
     fi
     $INVOKE zope$ZVER stop "INSTANCE=$INSTANCE" || true
     remove_products || true