From 2f185fc6b59b40d65f4b60276cf41aeffac7c3f6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 5 Nov 2010 00:07:29 +0000
Subject: runit-scripts: updated for runit 2.2.1

---
 abs/core/runit-scripts/PKGBUILD       |  4 ++--
 abs/core/runit-scripts/runit.install  | 20 ++++++++++++++++++--
 abs/core/runit-scripts/runitscripts/2 |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 4fcc454..46c55b6 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
-pkgver=1.8.0
-pkgrel=121
+pkgver=2.1.1
+pkgrel=2
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install
index 1e3f619..138d498 100755
--- a/abs/core/runit-scripts/runit.install
+++ b/abs/core/runit-scripts/runit.install
@@ -22,11 +22,11 @@ fi
 
 post_install () {
  
- mkdir /var/service
+  [ -e /service ] ||  mkdir /service
   servicelist="acpid cron  frontend  lircd ntpd alsa-utils  avahi   dbus   portmap  sshd syslog-ng tty2 tty3"
   for i in $servicelist
   do
-   ln -s /etc/sv/$i /var/service/$i
+   ln -s /etc/sv/$i /service/$i
   done
 
   [ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt
@@ -48,6 +48,22 @@ post_upgrade(){
   [ -e /sbin/poweroff ] ||  ln -s /sbin/poweroff.script /sbin/poweroff
   [ -e /sbin/reboot.init ] || ln -s /sbin/halt-init /sbin/reboot.init
   [ -e /sbin/poweroff.init ] || ln -s /sbin/halt-init /sbin/poweroff.init
+
+  if [ -e /var/service ]
+  then
+	  if [ ! -e /service ]
+	  then
+		  mkdir /service
+		  cd /var/service
+		  for i in *
+		  do
+			  ln -s /etc/sv/$i /service/$i
+		  done
+	  fi
+	  
+  fi
+
+	 
 }
 
 op=$1
diff --git a/abs/core/runit-scripts/runitscripts/2 b/abs/core/runit-scripts/runitscripts/2
index 079b644..c1acfa0 100755
--- a/abs/core/runit-scripts/runitscripts/2
+++ b/abs/core/runit-scripts/runitscripts/2
@@ -5,4 +5,4 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
 #runsvchdir default >/dev/null
 
 exec env - PATH=$PATH \
-runsvdir -P /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+runsvdir -P /service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
-- 
cgit v0.12

