Преглед изворни кода

Allow special characters in Service Names

dennisro пре 6 година
родитељ
комит
941d6c28e9
2 измењених фајлова са 5 додато и 6 уклоњено
  1. 3 4
      data/services/mailcowdockerized/mailcowdockerized.sh
  2. 2 2
      dockerbunker.sh

+ 3 - 4
data/services/mailcowdockerized/mailcowdockerized.sh

@@ -3,8 +3,8 @@
 while true;do ls | grep -q dockerbunker.sh;if [[ $? == 0 ]];then BASE_DIR=$PWD;break;else cd ../;fi;done
 
 SERVICE_HOME="${BASE_DIR}"/data/docker-compose/mailcowdockerized
-PROPER_NAME="Mailcow Dockerized"
-SERVICE_NAME="$(echo -e "${PROPER_NAME,,}" | tr -d '[:space:]')"
+PROPER_NAME="Mailcow (Dockerized)"
+SERVICE_NAME="$(echo -e "${PROPER_NAME,,}" | tr -cd '[:alnum:]')"
 PROMPT_SSL=1
 
 declare -a environment=( "data/include/init.sh" "data/env/dockerbunker.env" "data/docker-compose/${SERVICE_NAME}/mailcow.conf" )
@@ -55,8 +55,7 @@ configure() {
 
 	pushd "${BASE_DIR}" >/dev/null
 	! [[ -d "${SERVICE_HOME}" ]] \
-	&& git clone https://github.com/mailcow/mailcow-dockerized.git data/docker-compose/mailcowdockerized >/dev/null \
-	&& exit_response
+	&& git clone https://github.com/mailcow/mailcow-dockerized.git data/docker-compose/mailcowdockerized >/dev/null
 	popd >/dev/null
 
 	echo -e "# \e[4mMailcow Dockerized Settings\e[0m"

+ 2 - 2
dockerbunker.sh

@@ -34,7 +34,7 @@ declare -a ALL_SERVICES=( \
 	"Hastebin" \
 	"IPsec VPN Server" \
 	"Kanboard" \
-	"Mailcow Dockerized" \
+	"Mailcow (Dockerized)" \
 	"Mailpile" \
 	"Mastodon" \
 	"Nextcloud" \
@@ -52,7 +52,7 @@ declare -a ALL_SERVICES=( \
 # style menu according to what status service has
 declare -A SERVICES_ARR
 for service in "${ALL_SERVICES[@]}";do
-	service_name="$(echo -e "${service,,}" | tr -d '[:space:]')"
+	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")"
 		SERVICES_ARR+=( [$service_status]="${service_name}" )