Dennis Rodewyk 5 years ago
parent
commit
8fae20d256
1 changed files with 7 additions and 3 deletions
  1. 7 3
      dockerbunker.sh

+ 7 - 3
dockerbunker.sh

@@ -32,11 +32,15 @@ IFS=$'\n' sorted=($(printf '%s\n' "${ALL_SERVICES[@]}"|sort))
 declare -A SERVICES_ARR
 for service in "${sorted[@]}";do
 	service_name="$(echo -e "${service,,}" | tr -cd '[:alnum:]')"
-	if [[ "${INSTALLED_SERVICES[@]}" =~ "$service" ]];then
-		[[ "${STOPPED_SERVICES[@]}" =~ "$service" ]] && service_status="$(printf "\e[32m${service}\e[0m \e[31m(Stopped)\e[0m")" || service_status="$(printf "\e[32m${service}\e[0m")"
+	if elementInArray "$service" "${INSTALLED_SERVICES[@]}";then
+		if elementInArray "$service" "${STOPPED_SERVICES[@]}";then
+			service_status="$(printf "\e[32m${service}\e[0m \e[31m(Stopped)\e[0m")"
+		else
+			service_status="$(printf "\e[32m${service}\e[0m")"
+		fi
 		SERVICES_ARR+=( ["$service_status"]="${service_name}" )
 		AVAILABLE_SERVICES+=( "$service_status" )
-	elif [[ "${CONFIGURED_SERVICES[@]}" =~ "$service" ]];then
+	elif elementInArray "${service}" "${CONFIGURED_SERVICES[@]}";then
 		service_status="$(printf "\e[33m${service}\e[0m")"
 		SERVICES_ARR+=( ["$service_status"]="${service_name}" )
 		AVAILABLE_SERVICES+=( "$service_status" )