MT#62763 Fix shellcheck issues

Warned-by: shellcheck Change-Id: I86da18b3f87620b67bd70aa6e0cfe744816c650a
3 weeks ago · 3c87cea516
parent ba26dc70eb
commit 3c87cea516
25 changed files with 34 additions and 25 deletions
--- a/.shellcheckrc
+++ b/.shellcheckrc
@ -0,0 +1,3 @@
+external-sources=true
+# Used for jdg-tap integration.
+source-path=source
--- a/helper/restore-permissions
+++ b/helper/restore-permissions
@ -26,6 +26,7 @@ else
    printf "Error: %s/main could not be read. Exiting.\n" "${FUNCTIONS}" >&2
    exit 1
  fi
+  # shellcheck source=./functions/main
  . "${FUNCTIONS}/main"
 fi

@ -51,6 +52,7 @@ cd "$target_directory"
 if ! [ -e "$target_directory"/.ngcpcfg_perms ]; then
  log_warn "Permission file ${target_directory}/.ngcpcfg_perms doesn't exist."
 else
+  # shellcheck disable=SC1091
  . "${target_directory}"/.ngcpcfg_perms
 fi

--- a/sbin/ngcpcfg
+++ b/sbin/ngcpcfg
@ -141,7 +141,7 @@ if [[ "${1:-}" == "decrypt" ]] ; then
    fi
  }
 else
-  # shellcheck disable=SC1090
+  # shellcheck source=./functions/main
  . "${FUNCTIONS}"/main
 fi

--- a/scripts/apply
+++ b/scripts/apply
@ -16,7 +16,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # based on check_local_state() from scripts/status
--- a/scripts/build
+++ b/scripts/build
@ -16,7 +16,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 MODIFIED_ONLY=false
--- a/scripts/cat
+++ b/scripts/cat
@ -32,7 +32,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 CONFIG_TYPES=(config maintenance sites network constants)
--- a/scripts/check
+++ b/scripts/check
@ -16,7 +16,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 usage() {
--- a/scripts/clean
+++ b/scripts/clean
@ -15,7 +15,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 cd "${NGCPCTL_MAIN}"
--- a/scripts/commit
+++ b/scripts/commit
@ -19,7 +19,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
 fi

 timestamp_replacementchars=''
-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # main script
@ -95,9 +95,11 @@ if [ -z "${NO_DB_SYNC:-}" ] ; then
    ngcp-sync-db-grants | sed "s/^/$timestamp_replacementchars/"
    ngcp-sync-db-creds | sed "s/^/$timestamp_replacementchars/"
    if [ -z "${NGCP_TYPE:-}" ] ; then # SPCE
+        # shellcheck disable=SC1091
        . /etc/default/ngcp-roles
    fi
    if [ "${NGCP_TYPE}" == "carrier" ] && [ "${NGCP_IS_PROXY}" == "yes" ] ; then
+        # shellcheck disable=SC1091
        . /etc/default/ngcp-db
        log_info "Synchronizing MariaDB grants/credentials for ${LOCAL_DBHOST}:${LOCAL_DBPORT}"
        ngcp-sync-db-grants --db-host "${LOCAL_DBHOST}" --db-port "${LOCAL_DBPORT}" --no-warnings | sed "s/^/$timestamp_replacementchars/"
--- a/scripts/decrypt
+++ b/scripts/decrypt
@ -24,8 +24,9 @@ fi
 # source the ${FUNCTIONS}/logs file instead.

 timestamp_replacementchars='' # unset by default
-# shellcheck disable=SC1090
+# shellcheck source=./functions/logs
 . "${FUNCTIONS}"/logs
+# shellcheck source=./functions/openpgp
 . "${FUNCTIONS}"/openpgp

 setup_shared_config() {
--- a/scripts/del
+++ b/scripts/del
@ -15,7 +15,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 ## functions {{{
--- a/scripts/diff
+++ b/scripts/diff
@ -17,7 +17,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
 fi

 timestamp_replacementchars=''
-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # main script
--- a/scripts/edit
+++ b/scripts/edit
@ -14,7 +14,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 if [ -z "${EDITOR:-}" ] ; then
--- a/scripts/encrypt
+++ b/scripts/encrypt
@ -18,8 +18,9 @@ if ! [ -r "${FUNCTIONS}"/openpgp ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main
+# shellcheck source=./functions/openpgp
 . "${FUNCTIONS}"/openpgp

 get_config_file_list() {
--- a/scripts/etckeeper
+++ b/scripts/etckeeper
@ -15,7 +15,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
 fi

 timestamp_replacementchars=''
-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # main script
--- a/scripts/get
+++ b/scripts/get
@ -41,7 +41,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # Get the list of configs in proper order to load.
--- a/scripts/initialise
+++ b/scripts/initialise
@ -14,7 +14,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # main script
--- a/scripts/log
+++ b/scripts/log
@ -14,7 +14,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 cd "$NGCPCTL_MAIN"
--- a/scripts/patch
+++ b/scripts/patch
@ -15,7 +15,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 cd "${NGCPCTL_MAIN}"
--- a/scripts/services
+++ b/scripts/services
@ -22,7 +22,7 @@ if [[ ! -r "${FUNCTIONS}"/main ]]; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # functions
@ -146,8 +146,8 @@ systemd_daemon_reload_preset() {
    systemctl daemon-reload 2>&1 || true

    log_debug "Removing any broken systemd service symlink"
-    find -L /etc/systemd/system -type l \
-      | xargs -r rm
+    find -L /etc/systemd/system -type l -print0 \
+      | xargs -0 -r rm

    log_debug "systemd needs preset-all to enable/disable services (to start them on boot)"
    log_debug "Running: rm -rf /etc/systemd/system/*.wants/ || true"
--- a/scripts/set
+++ b/scripts/set
@ -15,7 +15,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 ## functions {{{
--- a/scripts/show
+++ b/scripts/show
@ -14,7 +14,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
  exit 1
 fi

-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 if [ "$*" = "" ] ; then
--- a/scripts/status
+++ b/scripts/status
@ -15,7 +15,7 @@ if ! [ -r "${FUNCTIONS}"/main ] ; then
 fi

 timestamp_replacementchars=''
-# shellcheck disable=SC1090
+# shellcheck source=./functions/main
 . "${FUNCTIONS}"/main

 # main script
--- a/t/fixtures/read_cfg.sh
+++ b/t/fixtures/read_cfg.sh
@ -1,6 +1,6 @@
 #!/bin/bash
 [[ $# -ne 1 ]] && exit 1
-# shellcheck source=ngcpcfg.cfg
+# shellcheck source=./t/fixtures/ngcpcfg.cfg
 source "${1}"
 echo "[ngcpcfg]"
 # directory name where ngcpcfg is managed through git
--- a/testsuite/ngcp-network
+++ b/testsuite/ngcp-network
@ -22,7 +22,7 @@ bailout() {
  rm -f "$OUTPUT"
 }

-trap bailout 1 2 3 3 6 9 14 15
+trap bailout 1 2 3 3 6 14 15

 OK() {
    printf "ok %s           %s\n" "$1" "$2"