From 7faeb422dd97d29b4e8a90a654af11846f8d4fcf Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 14 Jul 2015 13:13:43 +0000
Subject: [PATCH] - merged shell fixes patch

---
 lib/functions   | 15 ++-------------
 rc.d/rc         | 17 +++++++++--------
 rc.d/rc.sysinit |  2 +-
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/lib/functions b/lib/functions
index 98de9cc..04e7f29 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
 }
 
diff --git a/rc.d/rc b/rc.d/rc
index eba0652..04d6f38 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -147,14 +147,15 @@ af7=$(termput op)
 text="$(termput op)$(nls '%sResource Manager: %sEntering runlevel number' "$af2" "$af7")"
 text_size="$(nls '%sResource Manager: %sEntering runlevel number' "" "")"
 resp_size="$(nls 'DONE')"
-{
-	local _len=${#text_size}
-	local _last_col=$(($INIT_COL+${#resp_size}-${#runlevel}))
-	while [ $((_len++)) -lt $_last_col ]; do
-		text="$text."
-	done
-	echo -n "$text"
-}
+
+_len=${#text_size}
+_last_col=$(($INIT_COL+${#resp_size}-${#runlevel}))
+while [ $((_len++)) -lt $_last_col ]; do
+	text="$text."
+done
+echo -n "$text"
+unset _len _last_col
+
 echo "${af6}[${af2} $runlevel ${af6}]${af7}"
 
 # Is there an rc directory for this new runlevel?
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 121e48f..dc3475b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -952,7 +952,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
 		. /etc/rc.d/rc.serial
 	fi
 
-	if [ -n "$PANIC_REBOOT_TIME" -a "$PANIC_REBOOT_TIME" -gt "0" -a -f /proc/sys/kernel/panic ]; then
+	if [ -n "$PANIC_REBOOT_TIME" ] && [ "$PANIC_REBOOT_TIME" -gt "0" ] && [ -f /proc/sys/kernel/panic ]; then
 		show 'Setting %s seconds for kernel reboot after panic' "$PANIC_REBOOT_TIME"; busy
 		# DEPRECATED: use /etc/sysctl.conf or kernel commandline instead
 		if sysctl -q -w kernel.panic=$PANIC_REBOOT_TIME; then ok; else fail; fi
-- 
2.37.3