From 344d48e01b26f4dcde625a773e81c241ca4960c7 Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Sun, 1 Nov 2015 08:46:00 -0600
Subject: [PATCH] Resolve SC2029: 'this expands on client side'

https://github.com/koalaman/shellcheck/wiki/SC2029

This patch addes inline directives where this is the desired behavior,
instead of globaly excluding the check.
---
 contrib/dokku_client.sh | 3 ++-
 tests.mk                | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/dokku_client.sh b/contrib/dokku_client.sh
index b630ca237..cc1fb4eae 100755
--- a/contrib/dokku_client.sh
+++ b/contrib/dokku_client.sh
@@ -93,6 +93,7 @@ if [[ ! -z $DOKKU_HOST ]]; then
     fi
 
     if [[ -z "$donotshift" ]]; then
+      # shellcheck disable=SC2029
       ssh -o LogLevel=QUIET -t "dokku@$DOKKU_HOST" "$@"
       exit $?
     fi
@@ -119,7 +120,7 @@ if [[ ! -z $DOKKU_HOST ]]; then
         done
       fi
     fi
-    # shellcheck disable=SC2086
+    # shellcheck disable=SC2086,SC2029
     ssh -o LogLevel=QUIET -t "dokku@$DOKKU_HOST" $long_args "$verb" "$appname" "${args[@]}"
   }
 
diff --git a/tests.mk b/tests.mk
index 56f22fb2a..f1aa3d1cd 100644
--- a/tests.mk
+++ b/tests.mk
@@ -64,7 +64,7 @@ lint:
 	# SC2143: Instead of [ -n $(foo | grep bar) ], use foo | grep -q bar - https://github.com/koalaman/shellcheck/wiki/SC2143
 	# SC2001: See if you can use ${variable//search/replace} instead. - https://github.com/koalaman/shellcheck/wiki/SC2001
 	@echo linting...
-	@$(QUIET) shellcheck -e SC2029 ./contrib/dokku_client.sh
+	@$(QUIET) shellcheck ./contrib/dokku_client.sh
 	@$(QUIET) find . -not -path '*/\.*' | xargs file | egrep "shell|bash" | egrep -v "directory|toml" | awk '{ print $$1 }' | sed 's/://g' | grep -v dokku_client.sh | xargs shellcheck -e SC2034,SC2086,SC2143,SC2001
 
 unit-tests: