Merge pull request #20 from jdeathe/issue/9

jdeathe · jdeathe · commit c56bfbf89a74 · 2015-10-23T17:01:50.000+01:00
ISSUE 9: Use local variable scope for BASH helper functions.
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ source build.conf`
`12`	`12`
`13`	`13`	`show_docker_image ()`
`14`	`14`	`{`
`15`		`- NAME=$1`
`16`		`- NAME_PARTS=(${NAME//:/ })`
	`15`	`+ local NAME=$1`
	`16`	`+ local NAME_PARTS=(${NAME//:/ })`
`17`	`17`
`18`	`18`	`# Set 'latest' tag if no tag requested`
`19`	`19`	`if [ ${#NAME_PARTS[@]} == 1 ]; then`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ fi`
`19`	`19`
`20`	`20`	`have_docker_container_name ()`
`21`	`21`	`{`
`22`		`- NAME=$1`
	`22`	`+ local NAME=$1`
`23`	`23`
`24`	`24`	`if [[ -n $(docker ps -a \| awk -v pattern="^${NAME}$" '$NF ~ pattern { print $NF; }') ]]; then`
`25`	`25`	`return 0`
`@@ -30,7 +30,7 @@ have_docker_container_name ()`
`30`	`30`
`31`	`31`	`is_docker_container_name_running ()`
`32`	`32`	`{`
`33`		`- NAME=$1`
	`33`	`+ local NAME=$1`
`34`	`34`
`35`	`35`	`if [[ -n $(docker ps \| awk -v pattern="^${NAME}$" '$NF ~ pattern { print $NF; }') ]]; then`
`36`	`36`	`return 0`
`@@ -41,7 +41,7 @@ is_docker_container_name_running ()`
`41`	`41`
`42`	`42`	`remove_docker_container_name ()`
`43`	`43`	`{`
`44`		`- NAME=$1`
	`44`	`+ local NAME=$1`
`45`	`45`
`46`	`46`	`if have_docker_container_name ${NAME} ; then`
`47`	`47`	`if is_docker_container_name_running ${NAME} ; then`