From c9c9e2220c6b6aa3308624f70024a7bc81029989 Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 19 Sep 2017 02:46:52 +0200 Subject: [PATCH] handle_domain_on_webserver.sh: fix error on determin database. --- handle_domain_on_webserver.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/handle_domain_on_webserver.sh b/handle_domain_on_webserver.sh index ef250ce..c3f7d7b 100755 --- a/handle_domain_on_webserver.sh +++ b/handle_domain_on_webserver.sh @@ -742,9 +742,9 @@ for domain in "${domain_req_for_del_arr[@]}" ; do site_cms="MediaWiki" elif [[ -r "$file_to_check" ]] && [[ ! -d "$file_to_check" ]]; then - db_search_strings='\$db_name \$mysql_db' + db_search_strings=('\$db_name' '\$mysql_db') _found=false - for _string in $db_search_strings ; do + for _string in ${db_search_strings[@]} ; do if grep -i -q -E "^\s*$_string" $file_to_check > /dev/null 2>&1 ; then database="$(grep -i -E "^\s*$_string" $file_to_check 2> /dev/null | awk -F '=' '{print$2}' | tail -1 )" @@ -794,6 +794,8 @@ for domain in "${domain_req_for_del_arr[@]}" ; do fi fi + site_cms="Kontext" + fi if $_found ; then @@ -805,14 +807,19 @@ for domain in "${domain_req_for_del_arr[@]}" ; do database_req_for_del_arr+=("${database}:${_doc_root}") fi - site_cms="Kontext" + #site_cms="Kontext" else __msg="No database found for documentroot directory ${_doc_root}" msg_missing_database_arr+=("$__msg") fi - [[ -n "$site_cms" ]] && site_cms_arr+=("${site_cms}:${_doc_root}") + if [[ -n "$site_cms" ]] ; then + if ! containsElement "${site_cms}:${_doc_root}" "${site_cms_arr[@]}" ; then + site_cms_arr+=("${site_cms}:${_doc_root}") + fi + fi + done