From 49f542ee649c841cd0f9e27507bcd3be273f6ade Mon Sep 17 00:00:00 2001 From: James Deathe Date: Fri, 23 Oct 2015 17:00:26 +0100 Subject: [PATCH] ISSUE 9: Use local variable scope for BASH helper functions. --- build.sh | 4 ++-- run.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 023d8ae..0802bf3 100755 --- a/build.sh +++ b/build.sh @@ -12,8 +12,8 @@ source build.conf show_docker_image () { - NAME=$1 - NAME_PARTS=(${NAME//:/ }) + local NAME=$1 + local NAME_PARTS=(${NAME//:/ }) # Set 'latest' tag if no tag requested if [ ${#NAME_PARTS[@]} == 1 ]; then diff --git a/run.sh b/run.sh index 3b34f14..5be3e34 100755 --- a/run.sh +++ b/run.sh @@ -19,7 +19,7 @@ fi have_docker_container_name () { - NAME=$1 + local NAME=$1 if [[ -n $(docker ps -a | awk -v pattern="^${NAME}$" '$NF ~ pattern { print $NF; }') ]]; then return 0 @@ -30,7 +30,7 @@ have_docker_container_name () is_docker_container_name_running () { - NAME=$1 + local NAME=$1 if [[ -n $(docker ps | awk -v pattern="^${NAME}$" '$NF ~ pattern { print $NF; }') ]]; then return 0 @@ -41,7 +41,7 @@ is_docker_container_name_running () remove_docker_container_name () { - NAME=$1 + local NAME=$1 if have_docker_container_name ${NAME} ; then if is_docker_container_name_running ${NAME} ; then