diff options
| author | Anoop C S <anoopcs@redhat.com> | 2017-10-11 13:29:13 +0530 | 
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2017-10-18 14:27:41 +0000 | 
| commit | 087703fae449b725ebd82bc3cd65763a016fb098 (patch) | |
| tree | 34ba22f3c5547b0b6e8a29a6b10c719639ebd005 | |
| parent | f0650fef60ca557ea1c60458f705ac9b52854b39 (diff) | |
extras/hooks: Fix errors reported via shellcheck utility
Change-Id: I217c6b2a39955f1709bb3452b00d33c2dcb60faa
BUG: 1500649
Signed-off-by: Anoop C S <anoopcs@redhat.com>
10 files changed, 30 insertions, 33 deletions
diff --git a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh index ee3ad341e16..1b9237cac01 100755 --- a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh +++ b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh @@ -74,7 +74,7 @@ get_and_set_xattr ()  ##------------------------------------------  ## Parse the arguments  ##------------------------------------------ -ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")  eval set -- "$ARGS"  while true; diff --git a/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh b/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh index 65cb212f09e..d8f14b5a12c 100755 --- a/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh +++ b/extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh @@ -30,7 +30,7 @@ ENABLED_NAME_PREFIX="S28"  ENABLED_NAME="Quota-root-xattr-heal.sh"  DISABLED_NAME="disabled-quota-root-xattr-heal.sh" -enable () +activate ()  {          ln -sf $DISABLED_STATE $1;  } @@ -38,7 +38,7 @@ enable ()  ##------------------------------------------  ## Parse the arguments  ##------------------------------------------ -ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")  eval set -- "$ARGS"  while true; @@ -93,9 +93,9 @@ FLAG=`cat $GLUSTERD_WORKDIR/vols/$VOL_NAME/info | grep "^status=" \        | awk -F'=' '{print $NF}'`;  if [ "$FLAG" != "1" ]  then -        enable $ENABLED_STATE_START; +        activate $ENABLED_STATE_START;          exit $?  fi -enable $ENABLED_STATE_ADD_BRICK; +activate $ENABLED_STATE_ADD_BRICK;  exit $? diff --git a/extras/hook-scripts/create/post/S10selinux-label-brick.sh b/extras/hook-scripts/create/post/S10selinux-label-brick.sh index f38555c26c0..94c624dbf59 100755 --- a/extras/hook-scripts/create/post/S10selinux-label-brick.sh +++ b/extras/hook-scripts/create/post/S10selinux-label-brick.sh @@ -14,7 +14,7 @@ OPTSPEC="volname:"  VOL=  parse_args () { -        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")          eval set -- "$ARGS"          while true; do @@ -53,7 +53,7 @@ set_brick_labels()  SELINUX_STATE=$(which getenforce && getenforce)  [ "${SELINUX_STATE}" = 'Disabled' ] && exit 0 -parse_args $@ +parse_args "$@"  [ -z "$VOL" ] && exit 1  set_brick_labels $VOL diff --git a/extras/hook-scripts/delete/pre/S10selinux-del-fcontext.sh b/extras/hook-scripts/delete/pre/S10selinux-del-fcontext.sh index 2c83331d5cd..7851e702382 100755 --- a/extras/hook-scripts/delete/pre/S10selinux-del-fcontext.sh +++ b/extras/hook-scripts/delete/pre/S10selinux-del-fcontext.sh @@ -13,12 +13,9 @@  PROGNAME="Sselinux"  OPTSPEC="volname:"  VOL= -CONFIGFILE= -LOGFILEBASE= -PIDDIR=  function parse_args () { -        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")          eval set -- "$ARGS"          while true; do @@ -53,7 +50,7 @@ function delete_brick_fcontext()  SELINUX_STATE=$(which getenforce && getenforce)  [ "${SELINUX_STATE}" = 'Disabled' ] && exit 0 -parse_args $@ +parse_args "$@"  [ -z "$VOL" ] && exit 1  delete_brick_fcontext $VOL diff --git a/extras/hook-scripts/set/post/S30samba-set.sh b/extras/hook-scripts/set/post/S30samba-set.sh index 97d067fc33f..c21cfb57205 100755 --- a/extras/hook-scripts/set/post/S30samba-set.sh +++ b/extras/hook-scripts/set/post/S30samba-set.sh @@ -28,7 +28,7 @@ USERSMB_SET=""  USERCIFS_SET=""  function parse_args () { -        ARGS=$(getopt -l $OPTSPEC  --name $PROGNAME -o "o:" -- $@) +        ARGS=$(getopt -l $OPTSPEC  --name $PROGNAME -o "o:" -- "$@")          eval set -- "$ARGS"          while true; do @@ -123,23 +123,23 @@ function get_smb () {          usersmbvalue=$(grep user.smb $GLUSTERD_WORKDIR/vols/"$volname"/info |\                         cut -d"=" -f2) -        if [[ $usercifsvalue = "disable" || $usersmbvalue = "disable" ]]; then +        if [ $usercifsvalue = "disable" ] || [ $usersmbvalue = "disable" ]; then                  uservalue="disable"          fi          echo "$uservalue"  } -parse_args $@ -if [ "0" = $(is_volume_started "$VOL") ]; then +parse_args "$@" +if [ "0" = "$(is_volume_started "$VOL")" ]; then      exit 0  fi -if [[ "$USERCIFS_SET" = "YES" || "$USERSMB_SET" = "YES" ]]; then +if [ "$USERCIFS_SET" = "YES" ] || [ "$USERSMB_SET" = "YES" ]; then      #Find smb.conf, smbd pid directory and smbd logfile path      find_config_info -    if [ $(get_smb "$VOL") = "disable" ]; then +    if [ "$(get_smb "$VOL")" = "disable" ]; then          del_samba_share $VOL          sighup_samba      else diff --git a/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh b/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh index c0aa73548fd..885ed03ad5b 100755 --- a/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh +++ b/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh @@ -104,7 +104,7 @@ function check_volume_status()      echo $status  } -mount_cmd="mount -t glusterfs "$local_node_hostname":/gluster_shared_storage \ +mount_cmd="mount -t glusterfs $local_node_hostname:/gluster_shared_storage \             /var/run/gluster/shared_storage"  if [ "$option" == "enable" ]; then @@ -117,7 +117,7 @@ if [ "$option" == "enable" ]; then          if [ "$retry" == 3 ]; then              break;          fi -        status = check_volume_status; +        status=$(check_volume_status)      done      # Mount the volume on all the nodes      umount /var/run/gluster/shared_storage diff --git a/extras/hook-scripts/start/post/S29CTDBsetup.sh b/extras/hook-scripts/start/post/S29CTDBsetup.sh index 4265cba54ee..330ce74c30e 100755 --- a/extras/hook-scripts/start/post/S29CTDBsetup.sh +++ b/extras/hook-scripts/start/post/S29CTDBsetup.sh @@ -21,7 +21,7 @@ VOL=  META="all"  function parse_args () { -        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")          eval set -- "$ARGS"          while true; do @@ -55,7 +55,7 @@ function add_fstab_entry () {          fi  } -parse_args $@ +parse_args "$@"  if [ "$META" = "$VOL" ]  then          mkdir -p $CTDB_MNT diff --git a/extras/hook-scripts/start/post/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh index 3e0f2573b60..d6b94e6bc5c 100755 --- a/extras/hook-scripts/start/post/S30samba-start.sh +++ b/extras/hook-scripts/start/post/S30samba-start.sh @@ -29,7 +29,7 @@ PIDDIR=  GLUSTERD_WORKDIR=  function parse_args () { -        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")          eval set -- "$ARGS"          while true; do @@ -57,8 +57,8 @@ function find_config_info () {                  echo "Samba is not installed"                  exit 1          fi -        CONFIGFILE=`echo $cmdout | awk {'print $2'}` -        PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}` +        CONFIGFILE=`echo $cmdout | awk '{print $2}'` +        PIDDIR=`smbd -b | grep PIDDIR | awk '{print $2}'`          LOGFILEBASE=`smbd -b | grep 'LOGFILEBASE' | awk '{print $2}'`  } @@ -95,13 +95,13 @@ function get_smb () {          usersmbvalue=$(grep user.smb $GLUSTERD_WORKDIR/vols/"$volname"/info |\                         cut -d"=" -f2) -        if [[ $usercifsvalue = "disable" || $usersmbvalue = "disable" ]]; then +        if [ $usercifsvalue = "disable" ] || [ $usersmbvalue = "disable" ]; then                  uservalue="disable"          fi          echo "$uservalue"  } -parse_args $@ +parse_args "$@"  if [ "$(get_smb "$VOL")" = "disable" ]; then          exit 0  fi diff --git a/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh b/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh index 5fb49bd9e97..e9116c8cfdb 100755 --- a/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh +++ b/extras/hook-scripts/stop/pre/S29CTDB-teardown.sh @@ -12,7 +12,7 @@ VOL=  META="all"  function parse_args () { -        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")          eval set -- "$ARGS"          while true; do @@ -51,7 +51,7 @@ function remove_fstab_entry () {          fi  } -parse_args $@ +parse_args "$@"  if [ "$META" = "$VOL" ]  then          umount "$CTDB_MNT" diff --git a/extras/hook-scripts/stop/pre/S30samba-stop.sh b/extras/hook-scripts/stop/pre/S30samba-stop.sh index 62cf7d1e0d2..6e542da1cc1 100755 --- a/extras/hook-scripts/stop/pre/S30samba-stop.sh +++ b/extras/hook-scripts/stop/pre/S30samba-stop.sh @@ -22,7 +22,7 @@ CONFIGFILE=  PIDDIR=  function parse_args () { -        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@) +        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME "$@")          eval set -- "$ARGS"          while true; do @@ -46,8 +46,8 @@ function find_config_info () {                  echo "Samba is not installed"                  exit 1          fi -        CONFIGFILE=`echo $cmdout | awk {'print $2'}` -        PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}` +        CONFIGFILE=`echo $cmdout | awk '{print $2}'` +        PIDDIR=`smbd -b | grep PIDDIR | awk '{print $2}'`  }  function del_samba_share () { @@ -65,7 +65,7 @@ function sighup_samba () {          fi  } -parse_args $@ +parse_args "$@"  find_config_info  del_samba_share $VOL  sighup_samba  | 
