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

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

[William Hubbs]

commit:     ce71ffbfbe5e44bb61a3f00faf8466071dab5ea7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 13 22:42:46 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 22:42:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ce71ffbf

openrc-run.sh: fix new required_* tests to exit properly

 sh/openrc-run.sh.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
index 37ed96f..8aba4e0 100644
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -227,6 +227,7 @@ eval "printf '%s\n' $required_dirs" | while read _d; do
 		exit 1
 	fi
 done
+[ $? -ne 0 ] && exit 1
 unset _d
 
 eval "printf '%s\n' $required_files" | while read _f; do
@@ -235,6 +236,7 @@ eval "printf '%s\n' $required_files" | while read _f; do
 		exit 1
 	fi
 done
+[ $? -ne 0 ] && exit 1
 unset _f
 
 if [ -n "$opts" ]; then

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

[William Hubbs]

commit:     4e44e2cd73fb7fe08fb229bc3192d14f97dc2aa2
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 13 20:50:59 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 21:27:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4e44e2cd

typo fix

X-Gentoo-Bug: 563010
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563010

 sh/openrc-run.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
index e9369e4..37ed96f 100644
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -222,7 +222,7 @@ done
 sourcex "$RC_SERVICE"
 
 eval "printf '%s\n' $required_dirs" | while read _d; do
-	if [ ! -d "$_d" ]; then
+	if [ -n "$_d" ] && [ ! -d "$_d" ]; then
 		eerror "$RC_SVCNAME: \`$_d' is not a directory"
 		exit 1
 	fi
@@ -230,7 +230,7 @@ done
 unset _d
 
 eval "printf '%s\n' $required_files" | while read _f; do
-	if [ ! -r "$_f" ]; then
+	if [ -n "$_f" ] && [ ! -r "$_f" ]; then
 		eerror "$RC_SVCNAME: \`$_f' is not readable"
 		exit 1
 	fi