From 50fccf47d4bd2ed6e7ea6ff7f72577c8e7b95d0d Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 23 Mar 2017 13:17:11 -0500 Subject: [PATCH] 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