Merge pull request xapi-project#5494 from psafont/sweep

shellscripts: fix the worse complaints from shellcheck

ocaml/libs/http-lib/client_server_test.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -eux
 
 trap 'kill $(jobs -p)' EXIT

ocaml/sdk-gen/windows-line-endings.sh

@@ -1,18 +1,19 @@
+#!/bin/bash
 #
 # Copyright (c) Cloud Software Group, Inc.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
-# 
+#
 #   1) Redistributions of source code must retain the above copyright
 #      notice, this list of conditions and the following disclaimer.
-# 
+#
 #   2) Redistributions in binary form must reproduce the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer in the documentation and/or other materials
 #      provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

ocaml/xenopsd/scripts/vif-real

@@ -70,7 +70,7 @@ handle_promiscuous()
     if [ $? -eq 0 -a -n "${arg}" ] ; then
         case $NETWORK_MODE in
             bridge)
-                case "${arg}" in 
+                case "${arg}" in
                     true|on) echo 1 > /sys/class/net/${dev}/brport/promisc ;;
                     *) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
                 esac
@@ -198,7 +198,7 @@ PRIVATE=/xapi/${DOMUUID}/private/vif/${DEVID}
 HOTPLUG_STATUS="${XENBUS_PATH}/hotplug-status"
 HOTPLUG_ERROR="${XENBUS_PATH}/hotplug-error"
 
-NETWORK_MODE=bridge 
+NETWORK_MODE=bridge
 if [ -e /sys/module/openvswitch ]; then
     NETWORK_MODE=openvswitch
 fi
@@ -221,7 +221,7 @@ if [ -n "${UDEV_CALL}" ] && \
     exit 0
 fi
 
-logger -t scripts-vif "Called as \"$@\" domid:$DOMID devid:$DEVID mode:$NETWORK_MODE"
+logger -t scripts-vif "Called as \"$*\" domid:$DOMID devid:$DEVID mode:$NETWORK_MODE"
 case "${ACTION}" in
 online)
     if [ "${TYPE}" = "vif" ] ; then

scripts/install-sdk-pool

@@ -49,7 +49,7 @@ echo "* starting VMS"
 echo "	starting: template ${VMTEMPLATE}"
 ${XE} vm-start uuid=${VMTEMPLATE}
 
-for vm in ${vms[@]}
+for vm in "${vms[@]}"
 do
 	VM=${vms[$i]}
 	echo "	starting: $vm"
@@ -69,11 +69,11 @@ ${XEBIN} -s ${masterip} -p ${port} -u root -pw "xensource" ${NOSSL} \
 	host-license-add license-file="${license}"
 
 # get all ips and update a license to it
-for vm in ${vms[@]}
+for vm in "${vms[@]}"
 do
 	ip=`${XE} vm-param-get --minimal uuid="${vm}" param-name=networks | awk '{print $2}'`
 	echo "	Applying license to ${vm} at IP (${ip})"
-	
+
 	${XEBIN} -s ${ip} -p ${port} -u root -pw "xensource" ${NOSSL} \
 		host-license-add license-file="${license}"
 done
@@ -82,13 +82,13 @@ sleep 40
 
 echo "* Pooling all VMs to $masterip"
 
-for vm in ${vms[@]}
+for vm in "${vms[@]}"
 do
 	ip=`${XE} vm-param-get --minimal uuid="${vm}" param-name=networks | awk '{print $2}'`
 	echo "	Pooling slave VM ${vm} to (${masterip})"
 
 	${XEBIN} -s ${ip} -p ${port} -u root -pw "xensource" ${NOSSL} \
 		pool-join master-address=${masterip} \
-		master-username=root master-password=xensource master		
+		master-username=root master-password=xensource master
 
 done

scripts/test-ha-sr2

@@ -72,7 +72,7 @@ echo -n "Waiting for Survival Rule 1: "
 wait_for_sr 1
 echo OK
 
-while [ /bin/true ]; do
+while true; do
     # Block statefile everywhere
     remote_exec_all "iptables -I OUTPUT -p tcp --dport 3260 -j DROP"
 

scripts/xe-install-supplemental-pack

@@ -4,7 +4,7 @@ set -e
 
 die()
 {
-  echo $@ >&2
+  echo "$@" >&2
   exit 1
 }