- merged misc fixes

[rc-scripts.git] / lib / functions

diff --git a/lib/functions b/lib/functions
index bbdbd64cfea3a8716080d2b8fe44e16692f206d7..6d68d96a22c6c6aa69cf751d28946617b73fba1e 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -5,7 +5,7 @@
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:   Greg Galloway and Marc Ewing
-# Modified for PLD Linux by:
+# Modified for TLD Linux by:
 #              Marek Obuchowicz <elephant@pld-linux.org>
 #              Arkadiusz Miśkiewicz <misiek@pld-linux.org>
 #              Michał Kochanowicz <mkochano@pld-linux.org>
@@ -47,7 +47,7 @@ CDONE="$GREEN"                # DONE and WORK color
 CBUSY="$MAGENTA"       # BUSY color
 CFAIL="$RED"           # FAIL and DIED color
 CPOWEREDBY="$CYAN"     # "Powered by" color
-CPLD="$GREEN"          # "PLD Linux Distribution" color
+CTLD="$GREEN"          # "TLD Linux" color
 CI="$RED"              # Capital I color (press I to enter interactive startup)
 CRESMAN="$GREEN"       # "Resource Manager" color
 CHARS=""               # Characters displayed on the beginning of show line
@@ -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
@@ -417,7 +406,7 @@ msg_usage() {
        nls "Usage: %s" "$*"
 }
 
-# Some functions to handle PLD Linux-style messages
+# Some functions to handle TLD Linux-style messages
 show() {
        local text len time
 
@@ -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