add_missing_columns.sh

@@ -409,7 +409,66 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
 
 
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"

add_missing_indices.sh

@@ -409,7 +409,67 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
+
 
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)"

add_missing_primary-keys.sh

@@ -409,7 +409,66 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
 
 
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"

add_user_to_group.sh

@@ -447,7 +447,66 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
 
 CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud`
 CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data`

check_encryption_scan_legacy-format

@@ -446,50 +446,35 @@ if [[ "$PHP_ENGINE" = "FPM" ]] ; then
       fi
       if [[ -z "$PHP_VERSION" ]] ; then
 
-         if $NGINX_IS_ENABLED ; then
+         warn "The PHP version was not specified and cannot be determined!"
-            upstream_handler="$(grep -o -E "^[^#]*fastcgi_pass\s+[^;]+" ${VHOST_CONFIG_FILE} | awk '{print$2}' )"
-            for _file in $(ls /etc/nginx/conf.d/) ; do 
-               _rp_file="$(realpath "/etc/nginx/conf.d/${_file}")"
-               if $(grep -q -E "\s+${upstream_handler}\s*" ${_rp_file} 2> /dev/null) ; then
-                  PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" ${_rp_file} \
-                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
-                  break
-               fi
-            done
-         fi
 
-         if [[ -z "$PHP_VERSION" ]] ; then
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
 
-            warn "Cannot determin the PHP version\! Enter it manually"
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
 
-            main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+         done
 
-            echo ""
-            echo -e "\033[32m--\033[m"
-            echo ""
-            echo "Enter the PHP main version, e.g. 7.4 or 8.2 .."
-            echo ""
-            echo ""
-            PHP_VERSION=
-            while [ "X$PHP_VERSION" = "X" ]
-            do
-               echononl "   PHP main version: "
-               read PHP_VERSION
-               if [ "X$PHP_VERSION" = "X" ]; then
-                  echo ""
-                  echo -e "\033[33m\033[1mInput is required !!\033[m"
-                  echo ""
-               fi
-               if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
-                  echo ""
-                  echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
-                  echo ""
-                  PHP_VERSION=
-               fi
-
-            done
-
-         fi
 
       fi
    fi

check_for_old_files.sh

@@ -446,50 +446,35 @@ if [[ "$PHP_ENGINE" = "FPM" ]] ; then
       fi
       if [[ -z "$PHP_VERSION" ]] ; then
 
-         if $NGINX_IS_ENABLED ; then
+         warn "The PHP version was not specified and cannot be determined!"
-            upstream_handler="$(grep -o -E "^[^#]*fastcgi_pass\s+[^;]+" ${VHOST_CONFIG_FILE} | awk '{print$2}' )"
-            for _file in $(ls /etc/nginx/conf.d/) ; do 
-               _rp_file="$(realpath "/etc/nginx/conf.d/${_file}")"
-               if $(grep -q -E "\s+${upstream_handler}\s*" ${_rp_file} 2> /dev/null) ; then
-                  PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" ${_rp_file} \
-                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
-                  break
-               fi
-            done
-         fi
 
-         if [[ -z "$PHP_VERSION" ]] ; then
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
 
-            warn "Cannot determin the PHP version\! Enter it manually"
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
 
-            main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+         done
 
-            echo ""
-            echo -e "\033[32m--\033[m"
-            echo ""
-            echo "Enter the PHP main version, e.g. 7.4 or 8.2 .."
-            echo ""
-            echo ""
-            PHP_VERSION=
-            while [ "X$PHP_VERSION" = "X" ]
-            do
-               echononl "   PHP main version: "
-               read PHP_VERSION
-               if [ "X$PHP_VERSION" = "X" ]; then
-                  echo ""
-                  echo -e "\033[33m\033[1mInput is required !!\033[m"
-                  echo ""
-               fi
-               if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
-                  echo ""
-                  echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
-                  echo ""
-                  PHP_VERSION=
-               fi
-
-            done
-
-         fi
 
       fi
    fi
@@ -524,8 +509,6 @@ echo ""
 echo -e   "   Webserver user.......................: $HTTP_USER"
 echo -e   "   Webserver group......................: $HTTP_GROUP"
 echo ""
-echo -e   "   PHP Command..........................: $PHP_BIN"
-echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
 echo ""

conf/hostname.conf.sample

@@ -101,10 +101,9 @@ DATABASE_NAME="ownCloud_test"
 # - Credentials to access MySQL/MariaDB Database
 # -
 # - Example
-# -    MYSQL_CREDENTIALS="--login-path=local"
+# -    mysql_credential_args="--login-path=local"
-# -    MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
+# -    mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default)
-# -    MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf"
+# -    mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf"
-# -    MYSQL_CREDENTIALS="-S/run/mysqld/mysqld.sock"
 # -
 MYSQL_CREDENTIALS="--login-path=local"
 

convert_filecache_bigint.sh

@@ -446,55 +446,39 @@ if [[ "$PHP_ENGINE" = "FPM" ]] ; then
       fi
       if [[ -z "$PHP_VERSION" ]] ; then
 
-         if $NGINX_IS_ENABLED ; then
+         warn "The PHP version was not specified and cannot be determined!"
-            upstream_handler="$(grep -o -E "^[^#]*fastcgi_pass\s+[^;]+" ${VHOST_CONFIG_FILE} | awk '{print$2}' )"
-            for _file in $(ls /etc/nginx/conf.d/) ; do 
-               _rp_file="$(realpath "/etc/nginx/conf.d/${_file}")"
-               if $(grep -q -E "\s+${upstream_handler}\s*" ${_rp_file} 2> /dev/null) ; then
-                  PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" ${_rp_file} \
-                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
-                  break
-               fi
-            done
-         fi
 
-         if [[ -z "$PHP_VERSION" ]] ; then
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
 
-            warn "Cannot determin the PHP version\! Enter it manually"
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
 
-            main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+         done
 
-            echo ""
-            echo -e "\033[32m--\033[m"
-            echo ""
-            echo "Enter the PHP main version, e.g. 7.4 or 8.2 .."
-            echo ""
-            echo ""
-            PHP_VERSION=
-            while [ "X$PHP_VERSION" = "X" ]
-            do
-               echononl "   PHP main version: "
-               read PHP_VERSION
-               if [ "X$PHP_VERSION" = "X" ]; then
-                  echo ""
-                  echo -e "\033[33m\033[1mInput is required !!\033[m"
-                  echo ""
-               fi
-               if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
-                  echo ""
-                  echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
-                  echo ""
-                  PHP_VERSION=
-               fi
-
-            done
-
-         fi
 
       fi
    fi
 fi
-
 if [[ -x "/usr/local/php-${PHP_VERSION}/bin/php" ]] ; then
    PHP_BIN="/usr/local/php-${PHP_VERSION}/bin/php"
 elif [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then

remove_user_from_group.sh

@@ -447,7 +447,66 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
 
 CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud`
 CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data`

replace_favicon.sh

@@ -412,7 +412,66 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
 
 echo ""
 echo -e "   \033[32m--\033[m"

replace_logo.sh

@@ -412,8 +412,66 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
 
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
 
 echo ""
 echo -e "   \033[32m--\033[m"

snippet-get-php-major-version

@@ -1,75 +0,0 @@
-if [[ "$PHP_ENGINE" = "FPM" ]] ; then
-   if [[ -z "$PHP_VERSION" ]] ; then
-      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
-         if $NGINX_IS_ENABLED ; then
-
-            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
-               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
-            fi
-
-         elif $APACHE2_IS_ENABLED ; then
-
-            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
-               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
-            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
-               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
-            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
-               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
-            fi
-
-         fi
-      fi
-      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
-         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
-                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
-      fi
-      if [[ -z "$PHP_VERSION" ]] ; then
-
-         if $NGINX_IS_ENABLED ; then
-            upstream_handler="$(grep -o -E "^[^#]*fastcgi_pass\s+[^;]+" ${VHOST_CONFIG_FILE} | awk '{print$2}' )"
-            for _file in $(ls /etc/nginx/conf.d/) ; do 
-               _rp_file="$(realpath "/etc/nginx/conf.d/${_file}")"
-               if $(grep -q -E "\s+${upstream_handler}\s*" ${_rp_file} 2> /dev/null) ; then
-                  PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" ${_rp_file} \
-                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
-                  break
-               fi
-            done
-         fi
-
-         if [[ -z "$PHP_VERSION" ]] ; then
-
-            warn "Cannot determin the PHP version\! Enter it manually"
-
-            main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
-
-            echo ""
-            echo -e "\033[32m--\033[m"
-            echo ""
-            echo "Enter the PHP main version, e.g. 7.4 or 8.2 .."
-            echo ""
-            echo ""
-            PHP_VERSION=
-            while [ "X$PHP_VERSION" = "X" ]
-            do
-               echononl "   PHP main version: "
-               read PHP_VERSION
-               if [ "X$PHP_VERSION" = "X" ]; then
-                  echo ""
-                  echo -e "\033[33m\033[1mInput is required !!\033[m"
-                  echo ""
-               fi
-               if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
-                  echo ""
-                  echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
-                  echo ""
-                  PHP_VERSION=
-               fi
-
-            done
-
-         fi
-
-      fi
-   fi
-fi

update_nextcloud.sh

@@ -500,7 +500,67 @@ fi
 
 # Check PHP Version
 #
-source ${script_dir}/snippet-get-php-major-version
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+         
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
+
 
 
 # - Determin PHP binary