common.sh: some shellcheck fixes

diff --git a/common.sh b/common.sh
index 947c1c2e9d9fa3bbfc1550a9a55f94b54f44f67b..37b751197524c6658287fd6e22c28be30ee44da3 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -14,6 +14,8 @@ top_dir=$(dirname "$bin_dir")
 if [ -z "$LOG_FILE" ]; then
        LOG_FILE="$top_dir/merge.log"
 fi
+# "... appears unused"
+# shellcheck disable=SC2034
 SHA1_FILE="$top_dir/SHA1s"
 CTRL_FILE="$top_dir/etc/control"
 
@@ -21,7 +23,11 @@ build_host="ash"
 build_dir="$HOME/next/next"
 gcc_version="4.9.0"
 j_factor=$(nproc)
+# "... appears unused"
+# shellcheck disable=SC2034
 gpg_key=89F91C0A41D5C07A
+# "... appears unused"
+# shellcheck disable=SC2034
 kup_gpg_key=015042F34957D06C
 
 if [ "$NEXT_BUILD_HOST" ]; then
@@ -89,8 +95,12 @@ get_build_flag()
 
 check_unmerged_files()
 {
+       # "In POSIX sh, 'local' is undefined."
+       # shellcheck disable=SC3043
        local tree="$1"
+       # shellcheck disable=SC3043
        local um_files
+       # shellcheck disable=SC3043
        local rm_files
 
        um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')