From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Fri, 25 Mar 2022 06:06:14 +0000 (+0530)
Subject: scripts/init.d/cgred.in: make it shellcheck complaint
X-Git-Tag: v3.0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fafc169af73c753a41aedf123f9bf60c7bf6174;p=thirdparty%2Flibcgroup.git

scripts/init.d/cgred.in: make it shellcheck complaint

Make cgred.in shellcheck complaint.  It fixes all the issues reported by
the shellcheck version version 0.7.0.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/scripts/init.d/cgred.in b/scripts/init.d/cgred.in
index f909886b..75377636 100644
--- a/scripts/init.d/cgred.in
+++ b/scripts/init.d/cgred.in
@@ -26,28 +26,30 @@
 #			cgroups to classify processes
 ### END INIT INFO
 
-prefix=@prefix@;exec_prefix=@exec_prefix@;sbindir=@sbindir@
+sbindir=@sbindir@
 CGRED_BIN=$sbindir/cgrulesengd
-CGRED_CONF=/etc/cgrules.conf
 
 # Sanity checks
-[ -x $CGRED_BIN ] || exit 1
+[[ -x $CGRED_BIN ]] || exit 1
 
 # Source function library & LSB routines
-. /etc/rc.d/init.d/functions
-. /lib/lsb/init-functions
+# shellcheck disable=SC1091
+source /etc/rc.d/init.d/functions
+# shellcheck disable=SC1091
+source /lib/lsb/init-functions
 
 # Read in configuration options.
-if [ -f "/etc/sysconfig/cgred.conf" ] ; then
-	. /etc/sysconfig/cgred.conf
+if [[ -f "/etc/sysconfig/cgred.conf" ]] ; then
+	# shellcheck disable=SC1091
+	source /etc/sysconfig/cgred.conf
 	OPTIONS="$NODAEMON $LOG"
-	if [ -n "$LOG_FILE" ]; then
+	if [[ -n "$LOG_FILE" ]]; then
 		OPTIONS="$OPTIONS --logfile=$LOG_FILE"
 	fi
-	if [ -n "$SOCKET_USER" ]; then
+	if [[ -n "$SOCKET_USER" ]]; then
 		OPTIONS="$OPTIONS -u $SOCKET_USER"
 	fi
-	if [ -n "$SOCKET_GROUP" ]; then
+	if [[ -n "$SOCKET_GROUP" ]]; then
 		OPTIONS="$OPTIONS -g $SOCKET_GROUP"
 	fi
 else
@@ -63,12 +65,12 @@ pidfile=/var/run/cgred.pid
 start()
 {
 	echo -n $"Starting CGroup Rules Engine Daemon: "
-	if [ -f "$lockfile" ]; then
-		log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
+	if [[ -f "$lockfile" ]]; then
+		log_failure_msg "$servicename is already running with PID $(cat ${pidfile})"
 		return 0
 	fi
-	num=`grep "cgroup" /proc/mounts | awk '$3=="cgroup"' | wc -l`
-	if [ $num -eq 0 ]; then
+	num=$(grep "cgroup" /proc/mounts | awk '$3=="cgroup"' | wc -l)
+	if [[ "$num" -eq 0 ]]; then
 		echo
 		log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
 		return 1
@@ -76,28 +78,27 @@ start()
 	daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
 	retval=$?
 	echo
-	if [ $retval -ne 0 ]; then
+	if [[ $retval -ne 0 ]]; then
 		return 7
 	fi
-	touch "$lockfile"
-	if [ $? -ne 0 ]; then
+	if ! touch "$lockfile"; then
 		return 1
 	fi
-	echo "`pidof $processname`" > $pidfile
+	pidof "$processname" > $pidfile
 	return 0
 }
 
 stop()
 {
 	echo -n $"Stopping CGroup Rules Engine Daemon..."
-	if [ ! -f $pidfile ]; then
+	if [[ ! -f $pidfile ]]; then
 		log_success_msg
 		return 0
 	fi
 	killproc -p $pidfile -TERM "$processname"
 	retval=$?
 	echo
-	if [ $retval -ne 0 ]; then
+	if [[ $retval -ne 0 ]]; then
 		return 1
 	fi
 	rm -f "$lockfile" "$pidfile"
@@ -126,18 +127,18 @@ case "$1" in
 		RETVAL=$?
 		;;
 	condrestart)
-		if [ -f "$lockfile" ]; then
+		if [[ -f "$lockfile" ]]; then
 			stop
 			start
 			RETVAL=$?
 		fi
 		;;
 	reload|flash)
-		if [ -f "$lockfile" ]; then
+		if [[ -f "$lockfile" ]]; then
 			echo $"Reloading rules configuration..."
-			kill -s 12 `cat ${pidfile}`
+			kill -s 12 "$(cat ${pidfile})"
 			RETVAL=$?
-			if [ $RETVAL -eq 0 ] ; then
+			if [[ $RETVAL -eq 0 ]] ; then
 				log_success_msg
 			else
 				log_failure_msg