[#3025] appease shellcheck

 . "${admin_utils}"
  ^--------------^ SC1090: Can't follow non-constant source. Use a directive to specify location.

    version=$(checked_mysql_version)
              ^-------------------^ SC2119: Use checked_mysql_version "$@" if function's $1 should mean script's $1.

... and others that spiraled afterwards

75 files changed, 180 insertions, 311 deletions

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 4d62192cce..3e90acd98c 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -16,12 +16,6 @@
 # - lease upload to the database
 # - lease database recount
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # shellcheck disable=SC2086
 # SC2086: Double quote to prevent globbing and word splitting.
 # Reason for disable: explicitly don't quote extra_arguments so it is
@@ -61,6 +55,7 @@ else
     SCRIPTS_DIR="@datarootdir@/@PACKAGE@/scripts"
 fi
 
+# shellcheck source=src/bin/admin/admin-utils.sh.in
 . "${admin_utils}"
 
 # Prints out usage version.
diff --git a/src/bin/admin/tests/admin_tests.sh.in b/src/bin/admin/tests/admin_tests.sh.in
index c6b8a26c93..0fd3084d3e 100644
--- a/src/bin/admin/tests/admin_tests.sh.in
+++ b/src/bin/admin/tests/admin_tests.sh.in
@@ -6,17 +6,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Include admin utilities
+# shellcheck source=src/bin/admin/admin-utils.sh.in
 . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 
 # Set location of the kea-admin.
diff --git a/src/bin/admin/tests/memfile_tests.sh.in b/src/bin/admin/tests/memfile_tests.sh.in
index ad10109d5f..b83d3d5688 100644
--- a/src/bin/admin/tests/memfile_tests.sh.in
+++ b/src/bin/admin/tests/memfile_tests.sh.in
@@ -6,17 +6,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Locations of memfile tools
diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 86d6382070..93f6dbb4de 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # shellcheck disable=SC2154
 # SC2154: ... is referenced but not assigned.
 # Reason: some variables are sourced.
@@ -18,9 +15,11 @@
 set -eu
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Include admin utilities
+# shellcheck source=src/bin/admin/admin-utils.sh.in
 . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 
 # Set path to the production schema scripts
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index eda3c6c2e3..2f9404a774 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # shellcheck disable=SC2154
 # SC2154: ... is referenced but not assigned.
 # Reason: some variables are sourced.
@@ -18,9 +15,11 @@
 set -eu
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Include admin utilities
+# shellcheck source=src/bin/admin/admin-utils.sh.in
 . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 
 # Set path to the production schema scripts
diff --git a/src/bin/agent/tests/ca_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in
index 0c055a7d86..569882770f 100644
--- a/src/bin/agent/tests/ca_process_tests.sh.in
+++ b/src/bin/agent/tests/ca_process_tests.sh.in
@@ -6,17 +6,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Path to the temporary configuration file.
@@ -80,9 +75,6 @@ CONFIG_PWD="{
 bin="kea-ctrl-agent"
 bin_path="@abs_top_builddir@/src/bin/agent"
 
-# Import common test library.
-. "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
-
 # This test verifies that syntax checking works properly. This function
 # requires 3 parameters:
 # test_name
@@ -120,7 +112,7 @@ shutdown_test() {
     # Instruct Control Agent to log to the specific file.
     set_logger
     # Start Control Agent.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Control Agent to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -130,7 +122,7 @@ shutdown_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Control Agent process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -158,7 +150,7 @@ shutdown_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
diff --git a/src/bin/d2/tests/d2_process_tests.sh.in b/src/bin/d2/tests/d2_process_tests.sh.in
index f6e3f312dc..81551d9925 100644
--- a/src/bin/d2/tests/d2_process_tests.sh.in
+++ b/src/bin/d2/tests/d2_process_tests.sh.in
@@ -6,12 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -140,6 +134,7 @@ bin="kea-dhcp-ddns"
 bin_path="@abs_top_builddir@/src/bin/d2"
 
 # Import common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # This test verifies that syntax checking works properly. This function
@@ -176,7 +171,7 @@ dynamic_reconfiguration_test() {
     # Instruct D2 to log to the specific file.
     set_logger
     # Start D2.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for D2 to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -186,7 +181,7 @@ dynamic_reconfiguration_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one D2 process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -207,7 +202,7 @@ dynamic_reconfiguration_test() {
     create_config "${CONFIG_INVALID}"
 
     # Try to reconfigure by sending SIGHUP
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # Wait up to 10s for the D2Controller to log reload signal received.
     wait_for_message 10 "DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD"  1
@@ -226,7 +221,7 @@ dynamic_reconfiguration_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: D2 was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -236,7 +231,7 @@ dynamic_reconfiguration_test() {
     create_config "${CONFIG}"
 
     # Reconfigure the server with SIGHUP.
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # There should be two occurrences of the DHCP4_CONFIG_COMPLETE messages.
     # Wait for it up to 10s.
@@ -253,7 +248,7 @@ dynamic_reconfiguration_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: D2 was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -275,7 +270,7 @@ shutdown_test() {
     # Instruct D2 to log to the specific file.
     set_logger
     # Start D2.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for D2 to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -285,7 +280,7 @@ shutdown_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one D2 process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -313,7 +308,7 @@ shutdown_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
diff --git a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
index 10243ede22..7d646f654d 100644
--- a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
+++ b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
@@ -6,12 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -284,6 +278,7 @@ bin="kea-dhcp4"
 bin_path="@abs_top_builddir@/src/bin/dhcp4"
 
 # Import common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # This test verifies that syntax checking works properly. This function
@@ -321,7 +316,7 @@ dynamic_reconfiguration_test() {
     # Instruct Kea to log to the specific file.
     set_logger
     # Start Kea.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Kea to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -331,7 +326,7 @@ dynamic_reconfiguration_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Kea process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -352,7 +347,7 @@ dynamic_reconfiguration_test() {
     create_config "${CONFIG_INVALID}"
 
     # Try to reconfigure by sending SIGHUP
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # The configuration should fail and the error message should be there.
     wait_for_message 10 "DHCP4_CONFIG_LOAD_FAIL" 1
@@ -371,7 +366,7 @@ dynamic_reconfiguration_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: Kea process was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -381,7 +376,7 @@ dynamic_reconfiguration_test() {
     create_config "${CONFIG}"
 
     # Reconfigure the server with SIGHUP.
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # There should be two occurrences of the DHCP4_CONFIG_COMPLETE messages.
     # Wait for it up to 10s.
@@ -398,7 +393,7 @@ dynamic_reconfiguration_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: Kea process was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -427,7 +422,7 @@ shutdown_test() {
     # Instruct Kea to log to the specific file.
     set_logger
     # Start Kea.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Kea to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -437,7 +432,7 @@ shutdown_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Kea process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -466,7 +461,7 @@ shutdown_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
@@ -493,7 +488,7 @@ lfc_timer_test() {
     # Instruct Kea to log to the specific file.
     set_logger
     # Start Kea.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Kea to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -503,7 +498,7 @@ lfc_timer_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Kea process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -526,7 +521,7 @@ lfc_timer_test() {
     create_config "${LFC_CONFIG}"
 
     # Reconfigure the server with SIGHUP.
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # There should be two occurrences of the DHCP4_CONFIG_COMPLETE messages.
     # Wait for it up to 10s.
@@ -543,7 +538,7 @@ lfc_timer_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: Kea process was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -557,7 +552,7 @@ lfc_timer_test() {
     fi
 
     # Send signal to Kea SIGTERM
-    send_signal 15 ${bin}
+    send_signal 15 "${bin}"
 
     # Wait up to 10s for the server's graceful shutdown. The graceful shut down
     # should be recorded in the log file with the appropriate message.
@@ -568,7 +563,7 @@ lfc_timer_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
diff --git a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
index afed5211a6..fa704e6288 100644
--- a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
+++ b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
@@ -6,12 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -301,6 +295,7 @@ bin="kea-dhcp6"
 bin_path="@abs_top_builddir@/src/bin/dhcp6"
 
 # Import common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # This test verifies that syntax checking works properly. This function
@@ -339,7 +334,7 @@ dynamic_reconfiguration_test() {
     # Instruct Kea to log to the specific file.
     set_logger
     # Start Kea.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Kea to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -349,7 +344,7 @@ dynamic_reconfiguration_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Kea process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -370,7 +365,7 @@ dynamic_reconfiguration_test() {
     create_config "${CONFIG_INVALID}"
 
     # Try to reconfigure by sending SIGHUP
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # The configuration should fail and the error message should be there.
     wait_for_message 10 "DHCP6_CONFIG_LOAD_FAIL" 1
@@ -389,7 +384,7 @@ dynamic_reconfiguration_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: Kea process was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -399,7 +394,7 @@ dynamic_reconfiguration_test() {
     create_config "${CONFIG}"
 
     # Reconfigure the server with SIGHUP.
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # There should be two occurrences of the DHCP6_CONFIG_COMPLETE messages.
     # Wait for it up to 10s.
@@ -416,7 +411,7 @@ dynamic_reconfiguration_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: Kea process was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -446,7 +441,7 @@ shutdown_test() {
     # Instruct Kea to log to the specific file.
     set_logger
     # Start Kea.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Kea to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -456,7 +451,7 @@ shutdown_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Kea process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -485,7 +480,7 @@ shutdown_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
@@ -513,7 +508,7 @@ lfc_timer_test() {
     # Instruct Kea to log to the specific file.
     set_logger
     # Start Kea.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Kea to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -523,7 +518,7 @@ lfc_timer_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Kea process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -546,7 +541,7 @@ lfc_timer_test() {
     create_config "${LFC_CONFIG}"
 
     # Reconfigure the server with SIGHUP.
-    send_signal 1 ${bin}
+    send_signal 1 "${bin}"
 
     # There should be two occurrences of the DHCP4_CONFIG_COMPLETE messages.
     # Wait for it up to 10s.
@@ -563,7 +558,7 @@ lfc_timer_test() {
     fi
 
     # Make sure the server is still operational.
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: Kea process was killed when attempting reconfiguration.\n"
         clean_exit 1
@@ -577,7 +572,7 @@ lfc_timer_test() {
     fi
 
     # Send signal to Kea SIGTERM
-    send_signal 15 ${bin}
+    send_signal 15 "${bin}"
 
     # Wait up to 10s for the server's graceful shutdown. The graceful shut down
     # should be recorded in the log file with the appropriate message.
@@ -588,7 +583,7 @@ lfc_timer_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
index 450e997201..ad87bd73cc 100644
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@ -13,9 +13,6 @@
 # shellcheck disable=SC2034
 # SC2034: ... appears unused. Verify use (or export if used externally).
 
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # shellcheck disable=SC2154
 # SC2154: ... is referenced but not assigned.
 # Reason: some variables are taken from keactrl.conf
@@ -414,8 +411,7 @@ if [ ! -f "${keactrl_conf}" ]; then
 fi
 
 # Include the configuration file.
-# Shellcheck complaints about not being to follow the source. Let's ingore it.
-# shellcheck disable=SC1090
+# shellcheck source=src/bin/keactrl/keactrl.conf.in
 . "${keactrl_conf}"
 
 # Get location of the DHCPv4 server binary.
diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in
index 03d1a0a4ef..81f30444ec 100644
--- a/src/bin/keactrl/tests/keactrl_tests.sh.in
+++ b/src/bin/keactrl/tests/keactrl_tests.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -21,6 +18,7 @@ set -eu
 # run_command would be used.
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Set location of the keactrl.
diff --git a/src/bin/netconf/tests/shtests/netconf_tests.sh.in b/src/bin/netconf/tests/shtests/netconf_tests.sh.in
index a98033c74b..963520eeb7 100644
--- a/src/bin/netconf/tests/shtests/netconf_tests.sh.in
+++ b/src/bin/netconf/tests/shtests/netconf_tests.sh.in
@@ -6,12 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -77,6 +71,7 @@ bin="kea-netconf"
 bin_path="@abs_top_builddir@/src/bin/netconf"
 
 # Import common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # This test verifies that help can be printed out.
@@ -158,7 +153,7 @@ shutdown_test() {
     # Instruct Netconf Agent to log to the specific file.
     set_logger
     # Start Netconf Agent.
-    start_kea ${bin_path}/${bin}
+    start_kea "${bin_path}/${bin}"
     # Wait up to 20s for Netconf Agent to start.
     wait_for_kea 20
     if [ "${_WAIT_FOR_KEA}" -eq 0 ]; then
@@ -168,7 +163,7 @@ shutdown_test() {
 
     # Check if it is still running. It could have terminated (e.g. as a result
     # of configuration failure).
-    get_pid ${bin}
+    get_pid "${bin}"
     if [ "${_GET_PIDS_NUM}" -ne 1 ]; then
         printf "ERROR: expected one Netconf Agent process to be started. Found %d processes\
  started.\n" "${_GET_PIDS_NUM}"
@@ -196,7 +191,7 @@ shutdown_test() {
     fi
 
     # Make sure the server is down.
-    wait_for_server_down 5 ${bin}
+    wait_for_server_down 5 "${bin}"
     assert_eq 1 "${_WAIT_FOR_SERVER_DOWN}" \
         "Expected wait_for_server_down return %d, returned %d"
 
diff --git a/src/bin/shell/tests/basic_auth_tests.sh.in b/src/bin/shell/tests/basic_auth_tests.sh.in
index 0d8b2b8c9d..6d45fe7005 100644
--- a/src/bin/shell/tests/basic_auth_tests.sh.in
+++ b/src/bin/shell/tests/basic_auth_tests.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -66,6 +63,7 @@ shell_bin_path="@abs_top_builddir@/src/bin/shell"
 tmpfile_path="@abs_top_builddir@/src/bin/shell/tests"
 
 # Import common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 run_kea_shell() {
diff --git a/src/bin/shell/tests/shell_process_tests.sh.in b/src/bin/shell/tests/shell_process_tests.sh.in
index 514bb2797b..8e7a1339ee 100644
--- a/src/bin/shell/tests/shell_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_process_tests.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -55,6 +52,7 @@ shell_bin_path="@abs_top_builddir@/src/bin/shell"
 tmpfile_path="@abs_top_builddir@/src/bin/shell/tests"
 
 # Import common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # This test verifies that Control Agent is shut down gracefully when it
diff --git a/src/bin/shell/tests/tls_ca_process_tests.sh.in b/src/bin/shell/tests/tls_ca_process_tests.sh.in
index e8937b8d12..528305b13e 100644
--- a/src/bin/shell/tests/tls_ca_process_tests.sh.in
+++ b/src/bin/shell/tests/tls_ca_process_tests.sh.in
@@ -6,17 +6,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
 
 # Include common test library.
+# shellcheck source=src/lib/testutils/dhcp_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
 
 # Path to the temporary configuration file.
@@ -107,9 +102,6 @@ shell_bin_path="@abs_top_builddir@/src/bin/shell"
 
 tmpfile_path="@abs_top_builddir@/src/bin/agent/tests"
 
-# Import common test library.
-. "@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh"
-
 list_commands_test() {
     local test_name="${1}"
     local config="${2}"
diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in
index 6260d2d273..046b949e4e 100644
--- a/src/lib/testutils/dhcp_test_lib.sh.in
+++ b/src/lib/testutils/dhcp_test_lib.sh.in
@@ -6,29 +6,21 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # shellcheck disable=SC2034
 # SC2034: ... appears unused. Verify use (or export if used externally).
 
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # shellcheck disable=SC2153
 # SC2153: Possible misspelling: ... may not be assigned, but ... is.
 
 # shellcheck disable=SC2154
 # SC2154: bin_path is referenced but not assigned.
 
-# shellcheck disable=SC3043
-# SC3043: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
 
 # Include XML reporting library.
+# shellcheck source=src/lib/testutils/xml_reporting_test_lib.sh.in
 . "@abs_top_builddir@/src/lib/testutils/xml_reporting_test_lib.sh"
 
 prefix="@prefix@"
diff --git a/src/lib/testutils/xml_reporting_test_lib.sh.in b/src/lib/testutils/xml_reporting_test_lib.sh.in
index 7c6dc0fffd..67d180957e 100644
--- a/src/lib/testutils/xml_reporting_test_lib.sh.in
+++ b/src/lib/testutils/xml_reporting_test_lib.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
diff --git a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
index d78ad7764e..35fede46d0 100644
--- a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
index 8777ab44a9..c51401be53 100644
--- a/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
index b3c0938f7c..786c77c1fa 100644
--- a/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
index c4df44b097..8c2f84e01f 100644
--- a/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
index 4a7221da1f..58b5e08008 100644
--- a/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
index 8e690f9bea..1f1f217004 100644
--- a/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
index edd768f0d4..c238ceb83e 100644
--- a/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
index edf0e786fa..c02cbc0d22 100644
--- a/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
index 370e45cab9..9c7530be57 100644
--- a/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
index 059b0bc06b..5092837c6d 100644
--- a/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
index 0661eba61e..a885e22417 100644
--- a/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
index a056ac2ab4..ceabf10b75 100644
--- a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
@@ -6,12 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
-# shellcheck disable=SC2039
-# SC2039: In POSIX sh, 'local' is undefined.
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -23,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
index 32c31cd6e2..0439dab2ca 100644
--- a/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
index 16267f3278..0404d1c754 100644
--- a/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
index 3a75fd1dcf..a8e7ec81d1 100644
--- a/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
index 292131ae9c..e27a037291 100644
--- a/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
index 72716fe620..1df9aac2ce 100644
--- a/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
index 6777d1cfce..1621a5f9e5 100644
--- a/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
index bbbac39b53..3179751c77 100644
--- a/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
index d0ceda86dd..c95cc8e278 100644
--- a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
index f86805e1f7..298822f98f 100644
--- a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
index 4c379bba0d..e2efb1b4b7 100644
--- a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
index cedd25303b..21b376bb02 100644
--- a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index b63f3b2527..01ed768a3e 100644
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
index caced005cc..b667c818d9 100644
--- a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
index 4a748b5b73..aebd1759a1 100644
--- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
index f9acd97445..0869c03325 100644
--- a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
index b6dc35af7a..d971ff3d88 100644
--- a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
index c9f123676c..21eb784afc 100644
--- a/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_018_to_019.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
index 98546be209..64bc6233e4 100644
--- a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in b/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
index 521f0a1f2b..ff948ba37e 100644
--- a/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_020_to_021.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index 303e75150a..ff726b7bdc 100644
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -12,9 +12,6 @@
 # including leases, reservations, etc... Use at your own peril.
 # Reference tables will be left in-tact.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -26,8 +23,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in b/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
index 29009855c8..a8f4c49d48 100644
--- a/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
index 266ce13a68..93f8ccb1c4 100644
--- a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
index 53df10c2b5..b249b52bd2 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
index a2f31b1e2e..bc2489f178 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
index 84cfb2da25..fe182767f2 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
index e460ef7956..d17dd0619a 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
index 244cde21c3..78b9175a27 100644
--- a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
index e2739758f1..2767f0eb2e 100644
--- a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
index 88b53de5ed..d1b2faa010 100644
--- a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
index 54b044c9c2..7c1e1f69e1 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
index 6fd4462ec5..0b36dadf90 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
index a62903ae43..029fed8dcd 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in b/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
index 12053369cb..35d3ac8df5 100644
--- a/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in b/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
index 1adb7225d8..c0894080ec 100644
--- a/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in b/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
index 3966f89849..18fb4901de 100644
--- a/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in b/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
index 1824a27b0c..92af8a7044 100644
--- a/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
index dc03096ca6..b94d9e600b 100644
--- a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in b/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
index 330d25b1fd..f9ac5b1b24 100644
--- a/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in b/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in
index 4c13e2d44b..6810ed0997 100644
--- a/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_013_to_014.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
index 340845bca8..eecf52f6fd 100644
--- a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in b/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in
index 826cd693e7..7258b6f74e 100644
--- a/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_015_to_016.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in b/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in
index 845e9ea543..7bcfc414c1 100644
--- a/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_016_to_017.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in b/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in
index 6b7b9769d0..4af85f92d1 100644
--- a/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_017_to_018.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
index 8f0a0fd587..f56cb1dc35 100644
--- a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in b/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in
index 0ac52d821c..2a80f5e278 100644
--- a/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_019_to_020.sh.in
@@ -6,9 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -20,8 +17,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi
 
diff --git a/src/share/database/scripts/pgsql/wipe_data.sh.in b/src/share/database/scripts/pgsql/wipe_data.sh.in
index 7c9c637233..4cb4d3689c 100644
--- a/src/share/database/scripts/pgsql/wipe_data.sh.in
+++ b/src/share/database/scripts/pgsql/wipe_data.sh.in
@@ -12,9 +12,6 @@
 # including leases, reservations, etc... Use at your own peril.
 # Reference tables will be left in-tact.
 
-# shellcheck disable=SC1091
-# SC1091: Not following: ... was not specified as input (see shellcheck -x).
-
 # Exit with error if commands exit with non-zero and if undefined variables are
 # used.
 set -eu
@@ -26,8 +23,10 @@ prefix="@prefix@"
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
 if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
+    # shellcheck source=./src/bin/admin/admin-utils.sh.in
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi