From aaf705c4f125224d4984775f396910c29a548bce Mon Sep 17 00:00:00 2001 From: Zack May Date: Wed, 10 Jul 2024 13:58:20 -0400 Subject: [PATCH 1/2] issue #115 instance name safety net --- varnishgather | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/varnishgather b/varnishgather index df591a5..665c071 100755 --- a/varnishgather +++ b/varnishgather @@ -428,6 +428,14 @@ done shift $((OPTIND - 1)) +if [ -z "$NAME" ]; then + VARNISHD_CMD=$(ps -o cmd= -p $(pgrep varnishd)) + if echo "$VARNISHD_CMD" | grep -q '\-n'; then + INSTANCE_NAME=$(echo "$VARNISHD_CMD" | grep -oP '(?<=-n )\S+') + NAME="-n $INSTANCE_NAME" + fi +fi + if [ $# -gt 0 ] then info "Unknown argument: $1" From db37aa2b18bab01f4fec11d66ca4e20172f801a7 Mon Sep 17 00:00:00 2001 From: Zack May Date: Wed, 17 Jul 2024 09:58:11 -0400 Subject: [PATCH 2/2] modified code to tighten it up and reduce lines --- varnishgather | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/varnishgather b/varnishgather index 665c071..bc91c7a 100755 --- a/varnishgather +++ b/varnishgather @@ -429,11 +429,9 @@ done shift $((OPTIND - 1)) if [ -z "$NAME" ]; then - VARNISHD_CMD=$(ps -o cmd= -p $(pgrep varnishd)) - if echo "$VARNISHD_CMD" | grep -q '\-n'; then - INSTANCE_NAME=$(echo "$VARNISHD_CMD" | grep -oP '(?<=-n )\S+') - NAME="-n $INSTANCE_NAME" - fi + VARNISHD_CMD=$(ps -o cmd= -p $(pgrep varnishd)) + INSTANCE_NAME=$(echo "$VARNISHD_CMD" | grep -oP '(?<=-n )\S+') + [ -n "$INSTANCE_NAME" ] && NAME="-n $INSTANCE_NAME" fi if [ $# -gt 0 ]