CA-405864: Fix shellcheck warnings

Signed-off-by: Lin Liu <[email protected]>

Author: liulinC

ocaml/xcp-rrdd/bin/rrdp-scripts/rrdd-plugins-init

@@ -8,29 +8,27 @@ STATE_DIR=/etc/xensource/static-vdis
 [ -e /opt/xensource/bin/static-vdis ] || exit 0
 
 clear_stale_state(){
-	for i in $(ls -1 ${STATE_DIR}); do
+	for i in "${STATE_DIR}"/*; do
 	    # Clear the now-stale symlink to the attached disk. From this point the disk will
 	    # be considered 'currently-attached=false'
-	    rm -f ${STATE_DIR}/${i}/disk
+	    rm -f "${i}"/disk
 
 	    # If the disk was supposed to be deleted altogether on reboot then do it now
-	    UUID=$(cat ${STATE_DIR}/${i}/vdi-uuid)
-	    if [ -e ${STATE_DIR}/${i}/delete-next-boot ]; then
+	    UUID=$(cat "${i}"/vdi-uuid)
+	    if [ -e "${i}"/delete-next-boot ]; then
 	       logger "Deleting stale static-configured state for VDI: ${UUID}"
-	       rm -rf ${STATE_DIR}/${i}
+	       rm -rf "${i}"
 	    fi;
 	done
 }
 
 attach_all(){
 	RC=0
-	ALL=$(ls -1 ${STATE_DIR})
 
-	for i in ${ALL}; do
-	    UUID=$(cat ${STATE_DIR}/${i}/vdi-uuid)
+	for i in "${STATE_DIR}"/*; do
+	    UUID=$(cat "${i}"/vdi-uuid)
 	    logger "Attempting to attach VDI: ${UUID}"
-	    OUTPUT=$(/opt/xensource/bin/static-vdis attach ${UUID} 2>&1)
-	    if [ $? -ne 0 ]; then
+	    if ! OUTPUT=$(/opt/xensource/bin/static-vdis attach "${UUID}" 2>&1); then
 	       RC=1
 	       logger "Attempt to attach VDI: ${UUID} failed -- skipping (Error was: ${OUTPUT})"
 	       return $RC
@@ -40,13 +38,10 @@ attach_all(){
 }
 
 detach_all(){
-	ALL=$(ls -1 ${STATE_DIR})
-
-	for i in ${ALL}; do
-	    UUID=$(cat ${STATE_DIR}/${i}/vdi-uuid)
+	for i in "${STATE_DIR}"/*; do
+	    UUID=$(cat "${i}"/vdi-uuid)
 	    logger "Attempting to detach VDI: ${UUID}"
-	    OUTPUT=$(/opt/xensource/bin/static-vdis detach ${UUID} 2>&1)
-	    if [ $? -ne 0 ]; then
+	    if ! OUTPUT=$(/opt/xensource/bin/static-vdis detach "${UUID}" 2>&1); then
 	       logger "Attempt to detach VDI: ${UUID} failed -- skipping (Error was: ${OUTPUT})"
 	    fi
 	done

scripts/attach-static-vdis

@@ -3,14 +3,14 @@
 # Example on-master-start script
 #
 start() {
-	echo -n $"Assuming role of master: "
+	printf "%s" "Assuming role of master: "
 	touch /tmp/master
-	echo $"OK"
+	echo "OK"
 	return 0
 }
 
 stop() {
-	echo $"Dropping role of master: "
+	echo "Dropping role of master: "
 	rm -f /tmp/master
 	return 0
 }
@@ -31,6 +31,6 @@ case "$1" in
 	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac

scripts/on-master-start

@@ -1,6 +1,8 @@
 #! /bin/bash
 
 if [ -f /etc/sysconfig/xapi ]; then
+  # shellcheck disable=SC1091
+  # disalbe the check as not available on checking machine
   . /etc/sysconfig/xapi
 fi
 
@@ -19,7 +21,7 @@ start() {
 	rm -rf /var/xapi/debug
 
         if [ -e /var/lock/subsys/xapi ]; then
-	    if [ -e /var/run/xapi.pid ] && [ -e /proc/`cat /var/run/xapi.pid` ]; then
+	    if [ -e /var/run/xapi.pid ] && [ -e "/proc/$(cat /var/run/xapi.pid)" ]; then
 		echo $"cannot start xapi: already running.";
 		logger "cannot start xapi: already running.";
 		return 1
@@ -50,11 +52,18 @@ start() {
 	    # want to avoid collisions with new domains. CA-375992
 	    rm -rf /var/lib/xcp/run/*
 	    echo
+	    # shellcheck disable=SC2154
+	    # xapiflags may come from sourced files
+	    #
+	    # shellcheck disable=SC2086
+	    # quote introduce invalid argument on empty
 	    exec "@OPTDIR@/bin/xapi" -nowatchdog ${xapiflags} \
 		-writereadyfile ${XAPI_STARTUP_COOKIE} -writeinitcomplete ${XAPI_INIT_COMPLETE_COOKIE} -onsystemboot
 		RETVAL=$?
 	else
 	    echo
+	    # shellcheck disable=SC2154
+	    # shellcheck disable=SC2086
 	    exec "@OPTDIR@/bin/xapi" -nowatchdog ${xapiflags} \
 		-writereadyfile ${XAPI_STARTUP_COOKIE} -writeinitcomplete ${XAPI_INIT_COMPLETE_COOKIE}
 		RETVAL=$?
@@ -89,7 +98,7 @@ stop() {
 		fi
 		sleep 1
 		echo -n .
-		RETRIES=$(( ${RETRIES} - 1 ))
+		RETRIES=$(( RETRIES - 1 ))
 	done
 
 	killproc xapi
@@ -106,32 +115,14 @@ stop() {
 	return $RETVAL
 }
 
-rhstatus() {
-	status xapi
-}
-
-restart() {
-	stop
-	start
-}
-
 case "$1" in
   start)
 	start
 	;;
   stop)
 	stop
 	;;
-  restart)
-	restart
-	;;
-  status)
-	rhstatus
-	;;
-  condrestart)
-	[ -f /var/lock/subsys/xapi ] && restart || :
-	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+	echo $"Usage: $0 {start|stop}"
 	exit 1
 esac

scripts/xapi-init

@@ -12,7 +12,7 @@
 # GNU Lesser General Public License for more details.
 #
 
-FILENAME=`basename $0`
+FILENAME=$(basename "$0")
 LOCKFILE='/dev/shm/xe_toolstack_restart.lock'
 
 (