From f5546a10003d2a8b707b571a29fb1c660f619ddb Mon Sep 17 00:00:00 2001 From: "Brown, Joshua" Date: Mon, 19 Feb 2024 20:03:19 +0000 Subject: [PATCH] Fix == and variables that were missing $ --- scripts/container_stop.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/container_stop.sh b/scripts/container_stop.sh index 96ee1b18d..101881b8a 100755 --- a/scripts/container_stop.sh +++ b/scripts/container_stop.sh @@ -58,7 +58,7 @@ while [ : ]; do esac done -if [ "$local_TAG_FLAG_DETECTED" = "1" ] && [ "$local_NAME_FLAG_DETECTED" = "1" ] +if [ "$local_TAG_FLAG_DETECTED" == "1" ] && [ "$local_NAME_FLAG_DETECTED" == "1" ] then echo "ERROR can only specify -t or -n cannot specify both" exit 1 @@ -69,24 +69,24 @@ CONTAINER_IDS=($(docker container ls --format "{{.ID}}")) CONTAINER_IMAGES=($(docker container ls --format "{{.Image}}")) CONTAINER_NAMES=($(docker container ls --format "{{.Names}}")) -if [ "$local_TAG_FLAG_DETECTED" = "1" ] +if [ "$local_TAG_FLAG_DETECTED" == "1" ] then for (( i=0; i<${#CONTAINER_IDS[@]}; i++)); do IMAGE="${CONTAINER_IMAGES[$i]}" - if [ "$IMAGE" = "local_CONTAINER_TAG" ] + if [ "$IMAGE" == "$local_CONTAINER_TAG" ] then echo "Stopping ${CONTAINER_IDS[$i]} ${CONTAINER_NAMES[$i]} $IMAGE" docker container stop --time "$SLEEP_TIME" "${CONTAINER_IDS[$i]}" fi done -elif [ "$local_NAME_FLAG_DETECTED" = "1" ] +elif [ "$local_NAME_FLAG_DETECTED" == "1" ] then for (( i=0; i<${#CONTAINER_IDS[@]}; i++)); do NAME="${CONTAINER_NAMES[$i]}" - if [ "$NAME" = "local_CONTAINER_NAME" ] + if [ "$NAME" == "$local_CONTAINER_NAME" ] then echo "Stopping ${CONTAINER_IDS[$i]} ${CONTAINER_NAMES[$i]} ${CONTAINER_IMAGES[$i]}" docker container stop --time "$SLEEP_TIME" "${CONTAINER_IDS[$i]}" @@ -102,7 +102,7 @@ else fi -if [ ! "${#CONTAINER_IDS[@]}" = "0" ] +if [ ! "${#CONTAINER_IDS[@]}" == "0" ] then sleep "$SLEEP_TIME" fi @@ -112,24 +112,24 @@ CONTAINER_IDS=($(docker container ls --format "{{.ID}}")) CONTAINER_IMAGES=($(docker container ls --format "{{.Image}}")) CONTAINER_NAMES=($(docker container ls --format "{{.Names}}")) -if [ "$local_TAG_FLAG_DETECTED" = "1" ] +if [ "$local_TAG_FLAG_DETECTED" == "1" ] then for (( i=0; i<${#CONTAINER_IDS[@]}; i++)); do IMAGE="${CONTAINER_IMAGES[$i]}" - if [ "$IMAGE" = "local_CONTAINER_TAG" ] + if [ "$IMAGE" == "$local_CONTAINER_TAG" ] then echo "ERROR still running ${CONTAINER_IDS[$i]} ${CONTAINER_NAMES[$i]} $IMAGE" exit 1 fi done -elif [ "$local_NAME_FLAG_DETECTED" = "1" ] +elif [ "$local_NAME_FLAG_DETECTED" == "1" ] then for (( i=0; i<${#CONTAINER_IDS[@]}; i++)); do NAME="${CONTAINER_NAMES[$i]}" - if [ "$NAME" = "local_CONTAINER_NAME" ] + if [ "$NAME" == "$local_CONTAINER_NAME" ] then echo "ERROR still running ${CONTAINER_IDS[$i]} ${CONTAINER_NAMES[$i]} ${CONTAINER_IMAGES[$i]}" exit 1 @@ -138,7 +138,7 @@ then else - if [ ! "${#CONTAINER_IDS[@]}" = "0" ] + if [ ! "${#CONTAINER_IDS[@]}" == "0" ] then docker container ls exit 1