From c7e5e3cc98303452d811eefb02cf9a75c49e847e Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sun, 13 Sep 2020 09:31:43 +0200 Subject: [PATCH] Appease shellcheck --- abra | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/abra b/abra index 7723a09..a9f16ae 100755 --- a/abra +++ b/abra @@ -1,7 +1,7 @@ #!/bin/bash PROGRAM_NAME=""$(basename "$0") -if [ $1 == "-a" ]; then +if [ "$1" == "-a" ]; then STACK_NAME=$2 shift 2 fi @@ -17,6 +17,7 @@ if type direnv > /dev/null 2>&1 && ! direnv status | grep -q 'Found RC allowed t fi if [ -f abra-commands.sh ]; then + # shellcheck disable=SC1091 . abra-commands.sh fi @@ -68,7 +69,7 @@ sub_run_args(){ exit fi - docker exec $DOCKER_ARGS -it "$CONTAINER" $@ + docker exec "$DOCKER_ARGS" -it "$CONTAINER" "$@" return } @@ -108,7 +109,7 @@ sub_logs (){ SERVICE=$1 shift - + if [ $# -eq 0 ]; then LOGS_ARGS="\ --follow \ @@ -116,10 +117,11 @@ sub_logs (){ --details \ --timestamps" else + # shellcheck disable=SC2124 LOGS_ARGS="$@" fi - docker service logs "${STACK_NAME}_${SERVICE}" $LOGS_ARGS + docker service logs "${STACK_NAME}_${SERVICE}" "$LOGS_ARGS" } subcommand=$1