Fix another (last?) shellcheck(1) warning ...

[trigger-rcmd.git] / scripts / trigger-rcmd

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index 5d96d7fae9aab9bb9585bc7ac576dcd6adfbd76a..102fe162754d5e25922b9feafeee233a3f9bb5b4 100755 (executable)
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # trigger-rcmp: Trigger remote commands
 #!/bin/sh
 #
 # trigger-rcmp: Trigger remote commands

-# Copyright (c)2014-2017 Alexander Barton (alex@barton.de)
+# Copyright (c)2014-2020 Alexander Barton (alex@barton.de)

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -33,35 +33,29 @@ do_rcmd() {
 
        # Read in job/configuration file, but ignore shellcheck(1) warnings:
        # shellcheck disable=1090
 
        # Read in job/configuration file, but ignore shellcheck(1) warnings:
        # shellcheck disable=1090

-       . "$cnf"
-
-       if [ $? -ne 0 ]; then
+       if ! . "$cnf"; then

                echo "$NAME: Failed to read \"$cnf\"!"
                return 2
        fi
 
        echo "$NAME: Checking system \"$SYSTEM\" ..."
                echo "$NAME: Failed to read \"$cnf\"!"
                return 2
        fi
 
        echo "$NAME: Checking system \"$SYSTEM\" ..."

-       fping -c1 -q "$SYSTEM" 2>/dev/null
-       if [ $? -ne 0 ]; then
+       if ! fping -c1 -q "$SYSTEM" 2>/dev/null; then

                if [ -n "$NO_WAKE" ]; then
                        echo "$NAME: \"$SYSTEM\" seems to be down, skipping job."
                        return 9
                fi
 
                echo "$NAME: \"$SYSTEM\" seems to be down, wake it up ..."
                if [ -n "$NO_WAKE" ]; then
                        echo "$NAME: \"$SYSTEM\" seems to be down, skipping job."
                        return 9
                fi
 
                echo "$NAME: \"$SYSTEM\" seems to be down, wake it up ..."

-               etherwake -b -i "$IFACE" "$(echo "$SYSTEM" | cut -d'.' -f1)"
-               if [ $? -ne 0 ]; then
+               if ! etherwake -b -i "$IFACE" "$(echo "$SYSTEM" | cut -d'.' -f1)"; then

                        echo "$NAME: Failed to wake \"$SYSTEM\"!" >&2
                        return 3
                fi
                echo "$NAME: Waiting for \"$SYSTEM\" to respond ..."
                for i in $(seq 1 $TIMEOUT); do
                        echo "$NAME: Failed to wake \"$SYSTEM\"!" >&2
                        return 3
                fi
                echo "$NAME: Waiting for \"$SYSTEM\" to respond ..."
                for i in $(seq 1 $TIMEOUT); do

-                       fping -c1 -q "$SYSTEM" 2>/dev/null
-                       [ $? -ne 0 ] || break
+                       fping -c1 -q "$SYSTEM" 2>/dev/null && break

                        sleep 1s
                done
                        sleep 1s
                done

-               fping -c1 -q "$SYSTEM" 2>/dev/null
-               if [ $? -ne 0 ]; then
+               if ! fping -c1 -q "$SYSTEM" 2>/dev/null; then

                        echo "$NAME: Failed to wake \"$SYSTEM\"!" >&2
                        return 4
                fi
                        echo "$NAME: Failed to wake \"$SYSTEM\"!" >&2
                        return 4
                fi


@@ -102,8 +96,7 @@ do_rcmd() {
                if [ "$rsys_users" = "0" ]; then
                        echo "$NAME: Power off \"$SYSTEM\" again ..."
                        # shellcheck disable=2029
                if [ "$rsys_users" = "0" ]; then
                        echo "$NAME: Power off \"$SYSTEM\" again ..."
                        # shellcheck disable=2029

-                       ssh -o PreferredAuthentications=publickey -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
-                       if [ $? -ne 0 ]; then
+                       if ! ssh -o PreferredAuthentications=publickey -q "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null 2>&1; then

                                echo "$NAME: Failed to power off \"$SYSTEM\"!" >&2
                                return 5
                        fi
                                echo "$NAME: Failed to power off \"$SYSTEM\"!" >&2
                                return 5
                        fi