[gentoo-commits] proj/openrc:0.24.x commit in: /

2017-03-23 Thread William Hubbs 
commit: 5534b22c636bf6f9500ac65eca33f4aade34b393
Author: William Hubbs  gmail  com>
AuthorDate: Thu Mar 23 22:50:51 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Mar 23 22:50:51 2017 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5534b22c

update ChangeLog

 ChangeLog | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ae0a2f7..f3f5d9b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit 477e3dd8c13705affe87cc2c0e9286b2653a5688
+Author: William Hubbs 
+Commit: William Hubbs 
+
+sh/gendepends.sh.in: fix detection of service scripts
+
+We do not need to care about the path on the shebang line of a service
+script as long as the shebang line ends with "openrc-run".
+This fixes #119 and #120.
+
+commit 678e7adeb237edd080a13e463e5d8c40d2acdea7
+Author: William Hubbs 
+Commit: William Hubbs 
+
+version 0.24.2
+
+commit b087a751deb06986e0d77873046e08ca4864175c
+Author: William Hubbs 
+Commit: William Hubbs 
+
+update ChangeLog
+
 commit bc05fb75515b3f65f3c63ae5972c749fac00924f
 Author: William Hubbs 
 Commit: William Hubbs

[gentoo-commits] proj/openrc:0.24.x commit in: sh/

2017-03-23 Thread William Hubbs 
commit: 477e3dd8c13705affe87cc2c0e9286b2653a5688
Author: William Hubbs  gmail  com>
AuthorDate: Thu Mar 23 18:17:11 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Mar 23 18:46:18 2017 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=477e3dd8

sh/gendepends.sh.in: fix detection of service scripts

We do not need to care about the path on the shebang line of a service
script as long as the shebang line ends with "openrc-run".
This fixes #119 and #120.

 sh/gendepends.sh.in | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in
index 82088c51..45147e6a 100644
--- a/sh/gendepends.sh.in
+++ b/sh/gendepends.sh.in
@@ -74,11 +74,22 @@ do
 
# Only generate dependencies for OpenRC scripts
read one two three <"$RC_SERVICE"
-   [ "$one" = "#!@SBINDIR@/runscript" ] || \
-   [ "$one" = "#!@SBINDIR@/openrc-run" ] || \
-   [ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
-   [ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \
-   continue
+   case "$one" in
+   \#*/openrc-run) ;;
+   \#*/runscript) ;;
+   \#!)
+   case "$two" in
+   */openrc-run) ;;
+   */runscript) ;;
+   *)
+   continue
+   ;;
+   esac
+   ;;
+   *)
+   continue
+   ;;
+   esac
unset one two three
 
RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME

[gentoo-commits] proj/openrc:0.24.x commit in: /

2017-03-23 Thread William Hubbs 
commit: 678e7adeb237edd080a13e463e5d8c40d2acdea7
Author: William Hubbs  gmail  com>
AuthorDate: Thu Mar 23 18:34:31 2017 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Mar 23 18:34:31 2017 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=678e7ade

version 0.24.2

 Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index 2e116416..651a1fac 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=  openrc
-VERSION=   0.24.1
+VERSION=   0.24.2
 PKG=   ${NAME}-${VERSION}