Improve handling of maintainer scripts

 * checking for /etc/service symlink is moved into preinst
 * runscripts are enabled in postinst
 * runscripts are disables in prerm
 * supervise directory is purged on 'postrm purge'

6 files changed, 43 insertions, 22 deletions

diff --git a/debian/dh-runit.install b/debian/dh-runit.install
index faa7e8b..5b296b5 100644
--- a/debian/dh-runit.install
+++ b/debian/dh-runit.install
@@ -1,4 +1,6 @@
 dh_runit /usr/bin
+preinst-runit  /usr/share/debhelper/autoscripts
 postinst-runit /usr/share/debhelper/autoscripts
 prerm-runit    /usr/share/debhelper/autoscripts
+postrm-runit   /usr/share/debhelper/autoscripts
 runit.pm /usr/share/perl5/Debian/Debhelper/Sequence
diff --git a/dh_runit b/dh_runit
index 16af671..13caec5 100755
--- a/dh_runit
+++ b/dh_runit
@@ -72,6 +72,10 @@ sub ensure_executable($directory) {
     }
 }
 
+sub runit_autoscript($pkg, $script, $sed) {
+    autoscript($pkg, $script, "$script-runit", $sed);
+}
+
 init(option => { 'no-enable' => \$dh{NO_ENABLE} });
 
 PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) {
@@ -82,6 +86,7 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) {
     my $runit = pkgfile($pkg, 'runit');
     next unless $runit;
 
+    runit_autoscript($pkg, 'preinst', '');
     install_dir($sv_dir);
 
     for my $words (filedoublearray($runit)) {
@@ -102,9 +107,10 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) {
                      "/var/lib/runit/supervise/$name", $tmp);
 
         if ($enable eq 'enable' && !$dh{NO_ENABLE}) {
-            autoscript($pkg, 'postinst', 'postinst-runit', "s/#NAME#/$name/");
+            runit_autoscript($pkg, 'postinst', "s/#NAME#/$name/");
         }
-        autoscript($pkg, 'prerm', 'prerm-runit', "s/#NAME#/$name/");
+        runit_autoscript($pkg, 'prerm',  "s/#NAME#/$name/");
+        runit_autoscript($pkg, 'postrm', "s/#NAME#/$name/");
     }
     addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-4');
 }
diff --git a/postinst-runit b/postinst-runit
index 7c21f0e..1955857 100644
--- a/postinst-runit
+++ b/postinst-runit
@@ -1,20 +1,3 @@
-SV_ABS_DIR=/var/lib/runit/service
 SV_DIR=/etc/service
-mkdir -p "$SV_ABS_DIR"
-if [ ! -e "$SV_DIR" ] ; then
-    ln -s "$SV_ABS_DIR" "$SV_DIR"
-fi
-
-if [ "$(readlink -f "$SV_DIR")" != "$SV_ABS_DIR" ] ; then
-    cat <<EOF
-Service directory '$SV_DIR' exists, but is not symbolic link
-to '$SV_ABS_DIR'. It probably means that it was created by
-hand or versions of runit below 2.1.2-4.
-
-In either case, please remove service directory yourself and
-restart installation.
-EOF
-    exit 1
-fi
 ln -sf '/etc/sv/#NAME#' "$SV_DIR/"
-mkdir -p /var/lib/runit/supervise/#NAME#
+mkdir -p '/var/lib/runit/supervise/#NAME#'
diff --git a/postrm-runit b/postrm-runit
new file mode 100644
index 0000000..9556830
--- /dev/null
+++ b/postrm-runit
@@ -0,0 +1,12 @@
+#!/bin/sh # just to convince emacs that it is shell script
+
+if [ "$1" = 'purge' ] ; then
+    # If runscript was never invoked, these files would not exist,
+    # so we use -f option of rm(1).
+   for file in control lock ok pid stat status ; do
+       rm -f "/var/lib/runit/supervise/#NAME#/$file"
+   done
+   # It should exist and be empty now. If it is not, either user touched it,
+   # or there is a BUG in dh-runit!
+   rmdir "/var/lib/runit/supervise/#NAME#"
+fi
diff --git a/preinst-runit b/preinst-runit
new file mode 100644
index 0000000..eaccc4a
--- /dev/null
+++ b/preinst-runit
@@ -0,0 +1,19 @@
+#!/bin/sh # -*- shell-script -*-
+SV_ABS_DIR=/var/lib/runit/service
+SV_DIR=/etc/service
+mkdir -p "$SV_ABS_DIR"
+if [ ! -e "$SV_DIR" ] ; then
+    ln -s "$SV_ABS_DIR" "$SV_DIR"
+fi
+
+if [ "$(readlink -f "$SV_DIR")" != "$SV_ABS_DIR" ] ; then
+    cat <<EOF
+Service directory '$SV_DIR' exists, but is not symbolic link
+to '$SV_ABS_DIR'. It probably means that it was created by
+hand or versions of runit below 2.1.2-4.
+
+In either case, please remove service directory yourself and
+restart installation.
+EOF
+    exit 1
+fi
diff --git a/prerm-runit b/prerm-runit
index b23abeb..08aae6b 100644
--- a/prerm-runit
+++ b/prerm-runit
@@ -1,2 +1 @@
-rm -f /etc/service/#NAME#
-rm -fr /var/lib/runit/supervise/#NAME#/*
+rm -f '/etc/service/#NAME#'