ctdb-scripts: Avoid ShellCheck warnings SC2317, SC2086

New in ShellCheck 0.9.0:

  SC2317 (info): Command appears to be unreachable. Check usage (or ignore if invoked indirectly).

Also:

  SC2086 (info): Double quote to prevent globbing and word splitting.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/ctdb/config/events/legacy/05.system.script b/ctdb/config/events/legacy/05.system.script
index 56a07c7cc77f0e84455431eb76a1bf39bc1369ae..bf36dd21ffa7bc569145942d572d4172875c2d5d 100755 (executable)
--- a/ctdb/config/events/legacy/05.system.script
+++ b/ctdb/config/events/legacy/05.system.script
@@ -139,6 +139,8 @@ monitor_filesystem_usage()
        done
 }
 
+# shellcheck disable=SC2317
+# Called indirectly via check_thresholds()
 dump_memory_info()
 {
        get_proc "meminfo"

diff --git a/ctdb/config/events/legacy/40.vsftpd.script b/ctdb/config/events/legacy/40.vsftpd.script
index 19d40071ce25305e39202b83c691d9cf227ec059..1202812c3cd11cf01010506f524969cc7ecd8a00 100755 (executable)
--- a/ctdb/config/events/legacy/40.vsftpd.script
+++ b/ctdb/config/events/legacy/40.vsftpd.script
@@ -10,7 +10,9 @@ service_name="vsftpd"
 
 service_reconfigure ()
 {
-    service $service_name restart
+       # shellcheck disable=SC2317
+       # Called indirectly via ctdb_service_reconfigure()
+       service "$service_name" restart
 }
 
 load_script_options

diff --git a/ctdb/config/events/legacy/60.nfs.script b/ctdb/config/events/legacy/60.nfs.script
index 8e496f73cc5a0ec32bc7de2028b30661e00d9d6b..b7ae0746be56ccd22455be37fa1884ea02019818 100755 (executable)
--- a/ctdb/config/events/legacy/60.nfs.script
+++ b/ctdb/config/events/legacy/60.nfs.script
@@ -19,6 +19,8 @@ ctdb_setup_state_dir "service" "$service_name"
 service_reconfigure ()
 {
     # Restart lock manager, notify clients
+    # shellcheck disable=SC2317
+    # Called indirectly via check_thresholds()
     if [ -x "${CTDB_BASE}/statd-callout" ] ; then
        "${CTDB_BASE}/statd-callout" notify &
     fi >/dev/null 2>&1