ctdb-scripts: Avoid shellcheck warning SC2002 (useless cat)

SC2002: Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.

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

diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index 9726247a6aef95438a88f2d8b8bdecff5f0d836e..5d4400443d97c6263ba95d1f61fbbfdc8093cf94 100755 (executable)
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -32,8 +32,7 @@ loadconfig ctdb
 
     # Parse /proc/locks and extract following information
     #    pid process_name tdb_name offsets [W]
-    out=$( cat /proc/locks |
-    grep -F "POSIX  ADVISORY  WRITE" |
+    out=$( grep -F "POSIX  ADVISORY  WRITE" /proc/locks |
     awk '{ if($2 == "->") { print $6, $7, $8, $9, "W" } else { print $5, $6, $7, $8 } }' |
     while read pid rest ; do
        pname=$(readlink "/proc/${pid}/exe")

diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index ce7d63997d3095a792319e303eef3583d91b0bdb..4ac354ef29bb5626e864d45ea3a30166d62ba130 100755 (executable)
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -91,7 +91,7 @@ case "$1" in
                 printf "/statd-state@%s@/p\n", ip }')
        # Intentional multi-word expansion for multiple files
        # shellcheck disable=SC2086
-        if cat $files | sed -n "$sed_expr" | $CTDB ptrans "ctdb.tdb" ; then
+        if sed -n "$sed_expr" $files | $CTDB ptrans "ctdb.tdb" ; then
             rm $files
        fi
         ;;

diff --git a/ctdb/tools/ctdb_diagnostics b/ctdb/tools/ctdb_diagnostics
index 6b33c7ce537b60bc6d8332637b57d3846e8f89d3..139b406a5a8e1b4c047ec1873a82bb348e97b798 100755 (executable)
--- a/ctdb/tools/ctdb_diagnostics
+++ b/ctdb/tools/ctdb_diagnostics
@@ -106,7 +106,7 @@ show_file() {
     echo "  ================================"
     echo "  File: $fname"
     echo "  $_fdetails"
-    cat "$fname" 2>&1 | sed 's/^/  /'
+    sed 's/^/  /' "$fname" 2>&1
     echo "  ================================"
 }
 
@@ -138,7 +138,7 @@ show_and_compare_files () {
                echo "  ================================"
                echo "  File (on node $n): $f"
                echo "  `onnode $n ls -l $f 2>&1`"
-               cat "$fstf" | sed 's/^/  /'
+               sed 's/^/  /' "$fstf"
                echo "  ================================"
                first=false
            else