fix(shell): SC2230/avoid nonstandard which command (#457)

* fix(shell): SC2230 avoid `which`
* fix(shell): remove empty strings after echo
* fix(shell): `then` on same line as `if`

Author: kojiromike

docker/mysql-xtrabackup/xbackup.sh

@@ -442,8 +442,9 @@ _s_inf "INFO: Backup job started: ${_start_backup_date}"
 DEFAULTS_FILE_FLAG=
 [ -n "${DEFAULTS_FILE}" ] && DEFAULTS_FILE_FLAG="--defaults-file=${DEFAULTS_FILE}"
 # Check for innobackupex
-_ibx=$(which innobackupex)
-if [ "$?" -gt 0 ]; then _d_inf "ERROR: Could not find innobackupex binary!"; fi
+if ! _ibx=$(command -v innobackupex); then
+    _d_inf 'ERROR: Could not find innobackupex binary!'
+fi
 if [ -n ${DEFAULTS_FILE} ]; then _ibx="${_ibx} ${DEFAULTS_FILE_FLAG}"; fi
 if [ "x${GALERA_INFO}" = "x1" ]; then _ibx="${_ibx} --galera-info"; fi
 
@@ -463,12 +464,9 @@ fi
 #
 # Determine what will be our --incremental-basedir
 #
-if [ "${BKP_TYPE}" = "incr" ];
-then
-   if [ -n "${INC_BSEDIR}" ];
-   then
-      if [ ! -d ${WORK_DIR}/bkps/${INC_BSEDIR} ];
-      then
+if [ "${BKP_TYPE}" = "incr" ]; then
+   if [ -n "${INC_BSEDIR}" ]; then
+      if [ ! -d ${WORK_DIR}/bkps/${INC_BSEDIR} ]; then
          _d_inf "ERROR: Specified incremental basedir ${WORK_DIR}/bkps/${_inc_basedir} does not exist.";
       fi
 
@@ -477,17 +475,15 @@ then
       _inc_basedir=${_last_bkp}
    fi
 
-   if [ ! -n "${_inc_basedir}" ];
-   then
+   if [ ! -n "${_inc_basedir}" ]; then
       _d_inf "ERROR: No valid incremental basedir found!";
    fi
 
    ( [ "x${APPLY_LOG}" = "x1" ] || [ "x${STOR_CMP}" = "x1" ] ) && \
       _inc_basedir_path="${WORK_DIR}/bkps/${_inc_basedir}" || \
       _inc_basedir_path="${STOR_DIR}/bkps/${_inc_basedir}"
 
-   if [ ! -d "${_inc_basedir_path}" ];
-   then
+   if [ ! -d "${_inc_basedir_path}" ]; then
       _d_inf "ERROR: Incremental basedir ${_inc_basedir_path} does not exist.";
    fi
 
@@ -662,17 +658,14 @@ if [ "${status}" != 1 ]; then
    _start_prepare_date=$(date)
    _s_inf "INFO: Apply log started: ${_start_prepare_date}"
 
-   if [ "${BKP_TYPE}" = "incr" ];
-   then
-      if [ ! -n "${_incr_base}" ];
-      then
+   if [ "${BKP_TYPE}" = "incr" ]; then
+      if [ ! -n "${_incr_base}" ]; then
          _d_inf "ERROR: No valid base backup found!";
       fi
 
       _incr_base=P_${_incr_base}
 
-      if [ ! -d "${WORK_DIR}/bkps/${_incr_base}" ];
-      then
+      if [ ! -d "${WORK_DIR}/bkps/${_incr_base}" ]; then
          _d_inf "ERROR: Base backup ${WORK_DIR}/bkps/${_incr_base} does not exist.";
       fi
       _ibx_prep="${_ibx_prep} --apply-log --redo-only ${WORK_DIR}/bkps/${_incr_base} --incremental-dir ${_this_bkp}"

docker/openemr/7.0.3/openemr.sh

@@ -437,16 +437,16 @@ fi
 
 if [ "${SWARM_MODE}" = "yes" ]; then
     # Set flag that the instance is ready when in swarm mode
-    echo ""
+    echo
     echo "swarm mode on: this instance is ready"
-    echo ""
+    echo
     touch /root/instance-swarm-ready
 fi
 
-echo ""
+echo
 echo "Love OpenEMR? You can now support the project via the open collective:"
 echo " > https://opencollective.com/openemr/donate"
-echo ""
+echo
 
 if [ "${OPERATOR}" = yes ]; then
     echo 'Starting apache!'

docker/openemr/7.0.4/openemr.sh

@@ -437,16 +437,16 @@ fi
 
 if [ "${SWARM_MODE}" = "yes" ]; then
     # Set flag that the instance is ready when in swarm mode
-    echo ""
+    echo
     echo "swarm mode on: this instance is ready"
-    echo ""
+    echo
     touch /root/instance-swarm-ready
 fi
 
-echo ""
+echo
 echo "Love OpenEMR? You can now support the project via the open collective:"
 echo " > https://opencollective.com/openemr/donate"
-echo ""
+echo
 
 if [ "${OPERATOR}" = yes ]; then
     echo 'Starting apache!'

docker/openemr/flex-3.20/openemr.sh

@@ -505,10 +505,10 @@ else
    fi
 fi
 
-echo ""
+echo
 echo "Love OpenEMR? You can now support the project via the open collective:"
 echo " > https://opencollective.com/openemr/donate"
-echo ""
+echo
 
 if [ "${OPERATOR}" = yes ]; then
     echo 'Starting apache!'

docker/openemr/flex-3.21/openemr.sh

@@ -505,10 +505,10 @@ else
    fi
 fi
 
-echo ""
+echo
 echo "Love OpenEMR? You can now support the project via the open collective:"
 echo " > https://opencollective.com/openemr/donate"
-echo ""
+echo
 
 if [ "${OPERATOR}" = yes ]; then
     echo 'Starting apache!'

docker/openemr/flex-edge/openemr.sh

@@ -515,10 +515,10 @@ else
    fi
 fi
 
-echo ""
+echo
 echo "Love OpenEMR? You can now support the project via the open collective:"
 echo " > https://opencollective.com/openemr/donate"
-echo ""
+echo
 
 if [ "${OPERATOR}" = yes ]; then
     echo 'Starting apache!'

utilities/openemr-cmd/openemr-cmd

@@ -353,7 +353,7 @@ fi
 
 # Script usage.
 if [[ $# -eq 0 || "${FIRST_ARG}" = '--help' || "${FIRST_ARG}" = '-h' ]]; then
-    echo ""
+    echo
     echo "Usage: ${0##*/} COMMAND [ARGS]"
     echo "Usage: ${0##*/} -d <docker name> COMMAND [ARGS]"
     echo "Options:"

utilities/openemr-cmd/openemr-cmd-h

@@ -12,8 +12,7 @@ filter_help_output(){
 }
 
 # Use (( )) for numeric comparisons
-if (( $# == 0 ))
-then
+if (( $# == 0 )); then
     echo "To search the keyword from openemr-cmd -h output quickly
     Usage: openemr-cmd-h keyword
     e.g.   openemr-cmd-h ssl