diff --git a/handle_domain_on_webserver.sh b/handle_domain_on_webserver.sh index 62819e5..0d18ba0 100755 --- a/handle_domain_on_webserver.sh +++ b/handle_domain_on_webserver.sh @@ -368,31 +368,44 @@ echo -e " are posible values." echo "" echo "Blank seperated list of directories" echo "" +echo -e "Type:" +echo -e " \033[33m\033[1mNone\033[m\033[15Gfor no further vhost directoties" +echo -e " \033[33m\033[1m\033[m\033[15Gto accept the default inside the square brackets" +echo "" apache_additional_vhost_dirs= if [ -z "$_apache_additional_vhost_dirs" ]; then - echononl "Apache VHost directory: " + echononl "Additional Apache VHost directory [None]: " read apache_additional_vhost_dirs - while [[ "X$apache_additional_vhost_dirs" = "X" ]] ; do - echo -e "\n\t\033[33m\033[1mEingabe erforderlich.\033[m\n" - echononl "Apache VHost directory: " - read apache_additional_vhost_dirs - done + if [[ -z "trim($apache_additional_vhost_dirs)" ]] ; then + apache_additional_vhost_dirs="None" + elif [[ "${apache_additional_vhost_dirs,,}" = 'none' ]] ; then + apache_additional_vhost_dirs="None" + fi else - echononl "Apache VHost directory [${_apache_additional_vhost_dirs}]: " + echononl "Additional Apache VHost directories [${_apache_additional_vhost_dirs}]: " read apache_additional_vhost_dirs - if [[ "X$apache_additional_vhost_dirs" = "X" ]] ; then + if [[ "${apache_additional_vhost_dirs,,}" = 'none' ]] ; then + apache_additional_vhost_dirs="None" + elif [[ -z "$(trim $apache_additional_vhost_dirs)" ]] ; then apache_additional_vhost_dirs="$_apache_additional_vhost_dirs" fi fi -declare -a apache_additional_vhost_dir_arr=() -for _dir in $apache_additional_vhost_dirs ; do - if [[ -d "${apache_vhost_dir}/$_dir" ]] ; then - apache_additional_vhost_dir_arr+=("$_dir") - else - warn "$_dir is not a subdirectory of ${apache_vhost_dir}.\n\n \033[33m\033[1mIgnoring directory $_dir\033[m.." - fi -done +if [[ -n "$apache_additional_vhost_dirs" ]] && [[ "$apache_additional_vhost_dirs" != "None" ]]; then + declare -a apache_additional_vhost_dir_arr=() + for _dir in $apache_additional_vhost_dirs ; do + if [[ -d "${apache_vhost_dir}/$_dir" ]] ; then + apache_additional_vhost_dir_arr+=("$_dir") + else + warn "$_dir is not a subdirectory of ${apache_vhost_dir}.\n\n \033[33m\033[1mIgnoring directory $_dir\033[m.." + fi + done +fi + + +echo "" +echo "apache_additional_vhost_dirs: $apache_additional_vhost_dirs" +echo "" echo "" @@ -438,11 +451,16 @@ unset counter echo "" echo -e " Apache Vhosts Directory................: \033[1m$apache_vhost_dir\033[m" if [[ ${#apache_additional_vhost_dir_arr[@]} -gt 0 ]] ; then + declare -i counter=1 echo -en " Additional VHost Directories...........:\033[1m" for _dir in ${apache_additional_vhost_dir_arr[@]} ; do - echo -n " $_dir" + if [[ $counter -eq 1 ]] ; then + echo -e " \033[1m$_dir\033[m" + else + echo -e " \033[1m$_dir\033[m" + fi + counter=$((counter+1)) done - echo -e "\033[m" echo "" fi echo -e " Base Directory Apache Websites.........: \033[1m$apache_web_base_dir\033[m"