X-Git-Url: https://git.tld-linux.org/?p=rc-scripts.git;a=blobdiff_plain;f=lib%2Ffunctions;h=6d68d96a22c6c6aa69cf751d28946617b73fba1e;hp=98de9cc751aab69f60b2deff4bc31f9620111ffb;hb=a50fdc3af84c5a9f83fd4593dc7cdc7efa3a68ef;hpb=404f23ce096d6186062f68db607edac4a7068d61

diff --git a/lib/functions b/lib/functions
index 98de9cc..6d68d96 100644
--- a/lib/functions
+++ b/lib/functions
@@ -58,17 +58,6 @@ CCHARS="$NORMAL"	# Color of these characters (look at /etc/sysconfig/init-colors
 [ -r /etc/sysconfig/system ] && . /etc/sysconfig/system
 [ -r /etc/sysconfig/bootsplash ] && . /etc/sysconfig/bootsplash
 
-# if initscript is invoked via bash, enable RedHat/Fedora compatibility
-# RC_FEDORA is "set" if enabled and "unset" when not, but it's "value" is always empty
-# this is useful for inline constructs
-if [ "${BASH_VERSION+set}" = "set" ]; then
-	RC_LOGGING=yes
-	FASTRC=no
-	RC_FEDORA=
-else
-	unset RC_FEDORA || :
-fi
-
 if [ -z "$VSERVER" -o "$VSERVER" = "detect" ]; then
 	{
 		while read _f _ctx; do
@@ -466,7 +455,7 @@ busy() {
 }
 
 ok() {
-	echo -ne "$_ok${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
+	echo "$_ok"
 }
 
 started() {
@@ -474,7 +463,7 @@ started() {
 }
 
 fail() {
-	echo -ne "$_fail${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
+	echo "$_fail"
 	return 1
 }
 
@@ -588,7 +577,7 @@ run_cmd() {
 		cd /
 		export HOME=/tmp TMPDIR=/tmp
 		if is_no "$RC_LOGGING"; then
-			${user:+setuidgid -s $user} "$@" 2>&1
+			${user:+setuidgid -s $user} eval "$@" 2>&1
 		else
 			${user:+setuidgid -s $user} initlog -c "$*" 2>&1
 		fi