From 20f28047fed21ba21b180227247e714be6f6ee2a Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sun, 22 Oct 2017 18:55:26 +0200
Subject: [PATCH] Fix $NAME handling

---
 scripts/trigger-rcmd | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index cfd4d79..a2bf18f 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -10,7 +10,8 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-NAME=$(basename "$0")
+BASENAME=$(basename "$0")
+NAME="$BASENAME"
 RCMD_D="/usr/local/etc/rcmd.d"
 
 PATH="$PATH:/usr/local/sbin:/usr/sbin"
@@ -39,8 +40,6 @@ do_rcmd() {
 		return 2
 	fi
 
-	NAME="$NAME($1)"
-
 	echo "$NAME: Checking system \"$SYSTEM\" ..."
 	fping -c1 -q "$SYSTEM" 2>/dev/null
 	if [ $? -ne 0 ]; then
@@ -153,6 +152,7 @@ while [ $# -gt 0 ]; do
 		r=1
 	else
 		echo "$NAME: Working on \"$1\" - $(date "+%Y-%m-%d %H:%M:%S")"
+		NAME="$BASENAME($1)"
 		lck="/run/lock/$NAME-$1.lock"
 		if lockfile-create --quiet --use-pid --retry 2 --lock-name "$lck"; then
 			do_rcmd "$1" ; r=$?
@@ -162,6 +162,7 @@ while [ $# -gt 0 ]; do
 			echo "$NAME: Failed to acquire lock file, skipping job! ($lck)"
 			r=1
 		fi
+		NAME=$BASENAME
 	fi
 	[ $r -ne 0 ] && result=1
 	shift
-- 
2.39.2