Move snippet snippet-get-php-major-version into snippet dir and also rename it to 'get-php-major-version'.

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)"

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)"

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)"

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`

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

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

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

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

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

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

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

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

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`

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"

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 ""

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

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 ""
+_HEAD=false
-echo "Which site would you like to update?"
-echo ""
 declare -i i=0
-for _site in ${website_arr[@]} ; do
+if [[ ${#website_arr[@]}  -eq 1 ]] ; then
-   IFS=':' read -a _arr <<< ${_site}
+   IFS=':' read -a _arr <<< ${website_arr[0]}
-   echo "   [$i] ${_arr[0]}"
+   conf_file=${_arr[1]}
-   ((i++))
+   echo ""
-done
+   echo -e "Update site \033[1m ${_arr[0]}"
-echo
+   echo ""
-echononl "   Eingabe: "
+else
-while ! $_OK ; do
+   echo ""
-read _IN
+   echo "Which site would you like to update?"
-   if is_number "$_IN" && [[ -n ${website_arr[$_IN]} ]]; then
+   echo ""
-      IFS=':' read -a _arr <<< ${website_arr[$_IN]}
+   for _site in ${website_arr[@]} ; do
-      conf_file=${_arr[1]}
+      IFS=':' read -a _arr <<< ${_site}
-      _OK=true
+      echo "   [$i] ${_arr[0]}"
-   else
+      ((i++))
-      echo ""  
+   done
-      echo -e "\tFalsche Eingabe !"
+   echo
-      echo ""
+   echononl "   Eingabe: "
-      echononl "   Eingabe: "
+   while ! $_OK ; do
-   fi
+   read _IN
-done
+      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