diff --git a/add_missing_columns.sh b/add_missing_columns.sh index 267287f..8332d58 100755 --- a/add_missing_columns.sh +++ b/add_missing_columns.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -409,7 +410,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)" diff --git a/add_missing_indices.sh b/add_missing_indices.sh index a066260..dc65686 100755 --- a/add_missing_indices.sh +++ b/add_missing_indices.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -409,7 +410,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)" CURRENT_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)" diff --git a/add_missing_primary-keys.sh b/add_missing_primary-keys.sh index a930988..099c9e0 100755 --- a/add_missing_primary-keys.sh +++ b/add_missing_primary-keys.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -409,7 +410,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)" diff --git a/add_user_to_group.sh b/add_user_to_group.sh index 523a924..da403a5 100755 --- a/add_user_to_group.sh +++ b/add_user_to_group.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -447,7 +448,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud` CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data` diff --git a/check_encryption_scan_legacy-format b/check_encryption_scan_legacy-format index 7428509..2e462e3 100755 --- a/check_encryption_scan_legacy-format +++ b/check_encryption_scan_legacy-format @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/check_for_old_files.sh b/check_for_old_files.sh index 99a83ab..8c36b94 100755 --- a/check_for_old_files.sh +++ b/check_for_old_files.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/convert_filecache_bigint.sh b/convert_filecache_bigint.sh index 4329f6d..95d4630 100755 --- a/convert_filecache_bigint.sh +++ b/convert_filecache_bigint.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/occ_file_scan_all_accounts.sh b/occ_file_scan_all_accounts.sh index f0be062..4929572 100755 --- a/occ_file_scan_all_accounts.sh +++ b/occ_file_scan_all_accounts.sh @@ -4,6 +4,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/occ_file_scan_app-data.sh b/occ_file_scan_app-data.sh index 0b942a8..d1902ab 100755 --- a/occ_file_scan_app-data.sh +++ b/occ_file_scan_app-data.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/occ_maintenance.sh b/occ_maintenance.sh index c25a6a6..340aef4 100755 --- a/occ_maintenance.sh +++ b/occ_maintenance.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/occ_manual_upgrade.sh b/occ_manual_upgrade.sh index 574f828..a76b6bd 100755 --- a/occ_manual_upgrade.sh +++ b/occ_manual_upgrade.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/occ_update_apps.sh b/occ_update_apps.sh index a5b737b..509285b 100755 --- a/occ_update_apps.sh +++ b/occ_update_apps.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/remove_user_from_group.sh b/remove_user_from_group.sh index 40a9337..ee640b4 100755 --- a/remove_user_from_group.sh +++ b/remove_user_from_group.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -447,7 +448,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud` CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data` diff --git a/replace_favicon.sh b/replace_favicon.sh index a5a9fbb..6e202f6 100755 --- a/replace_favicon.sh +++ b/replace_favicon.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -412,7 +413,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version echo "" echo -e " \033[32m--\033[m" diff --git a/replace_logo.sh b/replace_logo.sh index 0257bfd..788e6b3 100755 --- a/replace_logo.sh +++ b/replace_logo.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -412,7 +413,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version echo "" diff --git a/restore_nextcloud.sh b/restore_nextcloud.sh index b8a06ab..1f658dd 100755 --- a/restore_nextcloud.sh +++ b/restore_nextcloud.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr diff --git a/snippet-get-php-major-version b/snippets/get-php-major-version old mode 100755 new mode 100644 similarity index 100% rename from snippet-get-php-major-version rename to snippets/get-php-major-version diff --git a/update_nextcloud.sh b/update_nextcloud.sh index 03df476..f451000 100755 --- a/update_nextcloud.sh +++ b/update_nextcloud.sh @@ -6,6 +6,7 @@ script_name="$(basename $(realpath $0))" script_dir="$(dirname $(realpath $0))" conf_dir="${script_dir}/conf" +snippet_dir="${script_dir}/snippets" declare -a unsorted_website_arr declare -a website_arr @@ -248,30 +249,39 @@ echo -e "\033[32m-----\033[m" WEBSITE= _OK=false -echo "" -echo "Which site would you like to update?" -echo "" +_HEAD=false declare -i i=0 -for _site in ${website_arr[@]} ; do - IFS=':' read -a _arr <<< ${_site} - echo " [$i] ${_arr[0]}" - ((i++)) -done -echo -echononl " Eingabe: " -while ! $_OK ; do -read _IN - if is_number "$_IN" && [[ -n ${website_arr[$_IN]} ]]; then - IFS=':' read -a _arr <<< ${website_arr[$_IN]} - conf_file=${_arr[1]} - _OK=true - else - echo "" - echo -e "\tFalsche Eingabe !" - echo "" - echononl " Eingabe: " - fi -done +if [[ ${#website_arr[@]} -eq 1 ]] ; then + IFS=':' read -a _arr <<< ${website_arr[0]} + conf_file=${_arr[1]} + echo "" + echo -e "Update site \033[1m ${_arr[0]}" + echo "" +else + echo "" + echo "Which site would you like to update?" + echo "" + for _site in ${website_arr[@]} ; do + IFS=':' read -a _arr <<< ${_site} + echo " [$i] ${_arr[0]}" + ((i++)) + done + echo + echononl " Eingabe: " + while ! $_OK ; do + read _IN + if is_number "$_IN" && [[ -n ${website_arr[$_IN]} ]]; then + IFS=':' read -a _arr <<< ${website_arr[$_IN]} + conf_file=${_arr[1]} + _OK=true + else + echo "" + echo -e "\tFalsche Eingabe !" + echo "" + echononl " Eingabe: " + fi + done +fi # - Reset IFS @@ -500,7 +510,7 @@ fi # Check PHP Version # -source ${script_dir}/snippet-get-php-major-version +source ${snippet_dir}/get-php-major-version # - Determin PHP binary