From: Martin Schwenke <martin@meltin.net>
Date: Wed, 6 Jul 2016 06:13:27 +0000 (+1000)
Subject: ctdb-scripts: Avoid shellcheck warnings SC2030, SC2031 (subshell variables)
X-Git-Tag: tdb-1.3.10~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efc9af26346621c8fc68c8eb5b16f946d405284c;p=thirdparty%2Fsamba.git

ctdb-scripts: Avoid shellcheck warnings SC2030, SC2031 (subshell variables)

SC2030: Modification of VAR is local (to subshell caused by (..) group).
SC2031: VAR was modified in a subshell. That change might be lost.

Fix a related, incorrect comment.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index 6b2bdbc5758..189e2f6203f 100755
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -80,6 +80,9 @@ nfs_check_service ()
 {
     _progname="$1"
 
+    # This sub-shell is created to intentionally limit the scope of
+    # variable values read from the .check files.
+    # shellcheck disable=SC2030
     (
 	# Subshell to restrict scope variables...
 
@@ -166,7 +169,10 @@ nfs_check_service ()
     ) || exit 1
 }
 
-# Uses: stop_service, start_service, debug_stuck_threads
+# Uses: service_stop_cmd, service_start_cmd, service_debug_cmd
+# This function is called within the sub-shell that shellcheck thinks
+# loses the above variable values.
+# shellcheck disable=SC2031
 nfs_restart_service ()
 {
     if [ -z "$service_stop_cmd" -o -z "$service_start_cmd" ] ; then