From 553762ca3095fff20e2cd96593ba2d53b6932a36 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 28 Apr 2015 13:20:29 +0000 Subject: abuild: require that .initd files are sbin/openrc-run The sbin/runscript was renamed to sbin/openrc-run with openrc-0.13 warn only if it is sbin/runscript for compatibility --- abuild.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/abuild.in b/abuild.in index acfef00..300b4d8 100644 --- a/abuild.in +++ b/abuild.in @@ -414,13 +414,20 @@ fetch() { # verify that all init.d scripts are openrc runscripts initdcheck() { - local i + local i line for i in $source; do case $i in - *.initd) - head -n 1 "$srcdir"/$i | grep -q '/sbin/runscript' \ - && continue - error "$i is not an openrc #!/sbin/runscript" + *.initd) line=$(head -n 1 "$srcdir"/$i);; + *) continue ;; + esac + + case "$line" in + *sbin/openrc-run) + ;; + *sbin/runscript) + warning "$i is not an openrc #!/sbin/openrc-run" + ;; + *) error "$i is not an openrc #!/sbin/openrc-run" return 1 ;; esac -- cgit v1.2.3