From d84294cf0b084020d9ad15f41f9f04728d67246c Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Thu, 3 Aug 2023 00:11:02 +0200
Subject: [PATCH] Add snippet 'get-path-of-php-command.sh' and change
 concerning code..

---
 add_missing_columns.sh                 |  9 +++-
 add_missing_indices.sh                 | 12 +++++-
 add_missing_primary-keys.sh            |  9 +++-
 add_user_to_group.sh                   | 11 ++++-
 check_encryption_scan_legacy-format.sh | 12 +++---
 check_for_old_files.sh                 | 16 +++----
 convert_filecache_bigint.sh            | 12 +++---
 occ_file_scan_all_accounts.sh          | 41 +++++++++++++++---
 occ_file_scan_app-data.sh              | 35 ++++++++++++---
 occ_maintenance.sh                     | 36 +++++++++++++---
 occ_manual_upgrade.sh                  | 36 +++++++++++++---
 occ_update_apps.sh                     | 36 +++++++++++++---
 remove_user_from_group.sh              | 12 +++++-
 replace_favicon.sh                     | 14 +++++-
 replace_logo.sh                        | 19 +++++++-
 restore_nextcloud.sh                   | 27 +++---------
 snippets/get-path-of-php-command.sh    |  7 +++
 update_nextcloud.sh                    | 60 +++++++++++---------------
 18 files changed, 287 insertions(+), 117 deletions(-)
 create mode 100644 snippets/get-path-of-php-command.sh

diff --git a/add_missing_columns.sh b/add_missing_columns.sh
index 4ea3f2e..989589b 100755
--- a/add_missing_columns.sh
+++ b/add_missing_columns.sh
@@ -294,6 +294,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 source ${snippet_dir}/get-php-major-version.sh
 
 
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)"
 
@@ -311,6 +316,8 @@ echo -e   "   Webserver group......................: $HTTP_GROUP"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 
 echo ""
 echo -n "   Type upper case 'YES' to continue executing with this parameters: "
@@ -516,7 +523,7 @@ echo ""
 # - Add missing columns
 # -
 echononl "   Add missing columns .."
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ db:add-missing-columns" -s /bin/bash $HTTP_USER > $log_file 2>&1
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ db:add-missing-columns" -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
 else
diff --git a/add_missing_indices.sh b/add_missing_indices.sh
index cf8db08..171c250 100755
--- a/add_missing_indices.sh
+++ b/add_missing_indices.sh
@@ -282,6 +282,7 @@ if [[ "$DATABASE_TYPE" = "postgres" ]]; then
    fi
 fi
 
+
 NGINX_IS_ENABLED=false
 APACHE2_IS_ENABLED=false
 
@@ -289,10 +290,17 @@ APACHE2_IS_ENABLED=false
 #
 source ${snippet_dir}/get-webservice-environment.sh
 
+
 # Check PHP Version
 #
 source ${snippet_dir}/get-php-major-version.sh
 
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)"
 
@@ -310,6 +318,8 @@ echo -e   "   Webserver group......................: $HTTP_GROUP"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 
 echo ""
 echo -n "   Type upper case 'YES' to continue executing with this parameters: "
@@ -515,7 +525,7 @@ echo ""
 # - Create missing indices
 # -
 echononl "   Add missing indices .."
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ db:add-missing-indices" -s /bin/bash $HTTP_USER > $log_file 2>&1
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ db:add-missing-indices" -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
 else
diff --git a/add_missing_primary-keys.sh b/add_missing_primary-keys.sh
index c11661b..33e7cde 100755
--- a/add_missing_primary-keys.sh
+++ b/add_missing_primary-keys.sh
@@ -294,6 +294,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 source ${snippet_dir}/get-php-major-version.sh
 
 
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)"
 
@@ -311,6 +316,8 @@ echo -e   "   Webserver group......................: $HTTP_GROUP"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 
 echo ""
 echo -n "   Type upper case 'YES' to continue executing with this parameters: "
@@ -516,7 +523,7 @@ echo ""
 # - Create missing indices
 # -
 echononl "   Add missing primary keys .."
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ db:add-missing-primary-keys" -s /bin/bash $HTTP_USER > $log_file 2>&1
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ db:add-missing-primary-keys" -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
 else
diff --git a/add_user_to_group.sh b/add_user_to_group.sh
index 7436e59..29b6418 100755
--- a/add_user_to_group.sh
+++ b/add_user_to_group.sh
@@ -333,6 +333,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 #
 source ${snippet_dir}/get-php-major-version.sh
 
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud`
 CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data`
 CURRENT_VERSION=`basename $CURRENT_INSTALL_DIR | cut -d"-" -f2`
@@ -391,6 +396,8 @@ echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
 echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
+echo ""
 echo -e   "   Databse name.........................: $DATABASE_NAME"
 echo -e   "   Database type........................: $DATABASE_TYPE"
 echo ""
@@ -429,7 +436,7 @@ echo ""
 # -
 echononl "   Add user \033[37m\033[1m$USER\033[m to group \033[37m\033[1m$GROUP\033[m .."
 
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ group:adduser '$GROUP' '$USER'" -s /bin/bash $HTTP_USER > $log_file 2>&1
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ group:adduser '$GROUP' '$USER'" -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
 else
@@ -437,7 +444,7 @@ else
    blank_line
    echo ""
    echo -e "\033[37m\033[1mcommandline was:\033[m"
-   echo "su -c \"/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ group:adduser '$GROUP' '$USER'\" -s /bin/bash $HTTP_USER"
+   echo "su -c \"${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ group:adduser '$GROUP' '$USER'\" -s /bin/bash $HTTP_USER"
    blank_line
    warn "Despite errors, it is possible that the user \033[37m\033[1m$USER\033[m was added to the group \033[37m\033[1m$GROUP\033[m"
    fatal "$(cat $log_file)"
diff --git a/check_encryption_scan_legacy-format.sh b/check_encryption_scan_legacy-format.sh
index b9250f7..2ebe21f 100755
--- a/check_encryption_scan_legacy-format.sh
+++ b/check_encryption_scan_legacy-format.sh
@@ -306,13 +306,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 #
 source ${snippet_dir}/get-php-major-version.sh
 
-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
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/check_for_old_files.sh b/check_for_old_files.sh
index 07219e7..a6dbe44 100755
--- a/check_for_old_files.sh
+++ b/check_for_old_files.sh
@@ -307,13 +307,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 #
 source ${snippet_dir}/get-php-major-version.sh
 
-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
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
@@ -379,7 +377,7 @@ echo ""
 # -
 echononl "   Check, if we can disable legacy encryption - Checking for old files.."
 
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ encryption:scan:legacy-format" -s /bin/bash $HTTP_USER > $log_file 2>&1
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ encryption:scan:legacy-format" -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
    info "Output of command \033[37m\033[1mocc encryption:scan:legacy-format\033[m was:\n\n$(cat $log_file)"
@@ -388,7 +386,7 @@ else
    blank_line
    echo ""
    echo -e "\033[37m\033[1mcommandline was:\033[m"
-   echo "su -c \"/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ encryption:scan:legacy-format\" -s /bin/bash $HTTP_USER"
+   echo "su -c \"${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ encryption:scan:legacy-format\" -s /bin/bash $HTTP_USER"
    error "Output of command \033[37m\033[1mocc encryption:scan:legacy-format\033[m was:\n\n$(cat $log_file)"
 fi
 
diff --git a/convert_filecache_bigint.sh b/convert_filecache_bigint.sh
index b9a490a..576c3b0 100755
--- a/convert_filecache_bigint.sh
+++ b/convert_filecache_bigint.sh
@@ -306,13 +306,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 #
 source ${snippet_dir}/get-php-major-version.sh
 
-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
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/occ_file_scan_all_accounts.sh b/occ_file_scan_all_accounts.sh
index 948d5c6..7c63d30 100755
--- a/occ_file_scan_all_accounts.sh
+++ b/occ_file_scan_all_accounts.sh
@@ -216,13 +216,38 @@ if [[ -z "$WEBSITE" ]] ; then
 
 fi
 
-WEB_BASE_DIR="/var/www/${WEBSITE}"
+
+# - Reset IFS
+# -
+IFS=$CUR_IFS
+
+DEFAULT_SRC_BASE_DIR="/usr/local/src/nextcloud"
+DEFAULT_HTTP_USER="www-data"
+DEFAULT_HTTP_GROUP="www-data"
+DEFAULT_PHP_ENGINE='FPM'
+
+echo ""
+echononl "   Include Configuration file.."
+if [[ ! -f $conf_file ]]; then
+   echo_failed
+   fatal "Missing configuration file '$conf_file'."
+else
+   source $conf_file
+   echo_ok
+fi
+echo ""
+
+DEFAULT_WEB_BASE_DIR="/var/www/${WEBSITE}"
+[[ -n "$WEB_BASE_DIR" ]] || WEB_BASE_DIR=$DEFAULT_WEB_BASE_DIR
 
 if [[ ! -d ${WEB_BASE_DIR} ]] ; then
    fatal "Web base directory '$WEB_BASE_DIR' not found!"
 fi
 
 DATA_DIR="$(realpath ${WEB_BASE_DIR}/data)"
+
+[[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
+
 INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
@@ -275,11 +300,15 @@ APACHE2_IS_ENABLED=false
 source ${snippet_dir}/get-webservice-environment.sh
 
 
-if [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+# Check PHP Version
+#
+source ${snippet_dir}/get-php-major-version.sh
+
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/occ_file_scan_app-data.sh b/occ_file_scan_app-data.sh
index 638d66b..c8f7e43 100755
--- a/occ_file_scan_app-data.sh
+++ b/occ_file_scan_app-data.sh
@@ -228,14 +228,33 @@ fi
 # -
 IFS=$CUR_IFS
 
+DEFAULT_SRC_BASE_DIR="/usr/local/src/nextcloud"
+DEFAULT_HTTP_USER="www-data"
+DEFAULT_HTTP_GROUP="www-data"
+DEFAULT_PHP_ENGINE='FPM'
 
-WEB_BASE_DIR="/var/www/${WEBSITE}"
+echo ""
+echononl "   Include Configuration file.."
+if [[ ! -f $conf_file ]]; then
+   echo_failed
+   fatal "Missing configuration file '$conf_file'."
+else
+   source $conf_file
+   echo_ok
+fi
+echo ""
+
+DEFAULT_WEB_BASE_DIR="/var/www/${WEBSITE}"
+[[ -n "$WEB_BASE_DIR" ]] || WEB_BASE_DIR=$DEFAULT_WEB_BASE_DIR
 
 if [[ ! -d ${WEB_BASE_DIR} ]] ; then
    fatal "Web base directory '$WEB_BASE_DIR' not found!"
 fi
 
 DATA_DIR="$(realpath ${WEB_BASE_DIR}/data)"
+
+[[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
+
 INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
@@ -288,11 +307,15 @@ APACHE2_IS_ENABLED=false
 source ${snippet_dir}/get-webservice-environment.sh
 
 
-if [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+# Check PHP Version
+#
+source ${snippet_dir}/get-php-major-version.sh
+
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/occ_maintenance.sh b/occ_maintenance.sh
index 7ab05f6..1a8288e 100755
--- a/occ_maintenance.sh
+++ b/occ_maintenance.sh
@@ -228,13 +228,33 @@ fi
 # -
 IFS=$CUR_IFS
 
-WEB_BASE_DIR="/var/www/${WEBSITE}"
+DEFAULT_SRC_BASE_DIR="/usr/local/src/nextcloud"
+DEFAULT_HTTP_USER="www-data"
+DEFAULT_HTTP_GROUP="www-data"
+DEFAULT_PHP_ENGINE='FPM'
+
+echo ""
+echononl "   Include Configuration file.."
+if [[ ! -f $conf_file ]]; then
+   echo_failed
+   fatal "Missing configuration file '$conf_file'."
+else
+   source $conf_file
+   echo_ok
+fi
+echo ""
+
+DEFAULT_WEB_BASE_DIR="/var/www/${WEBSITE}"
+[[ -n "$WEB_BASE_DIR" ]] || WEB_BASE_DIR=$DEFAULT_WEB_BASE_DIR
 
 if [[ ! -d ${WEB_BASE_DIR} ]] ; then
    fatal "Web base directory '$WEB_BASE_DIR' not found!"
 fi
 
 DATA_DIR="$(realpath ${WEB_BASE_DIR}/data)"
+
+[[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
+
 INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
@@ -293,11 +313,15 @@ APACHE2_IS_ENABLED=false
 source ${snippet_dir}/get-webservice-environment.sh
 
 
-if [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+# Check PHP Version
+#
+source ${snippet_dir}/get-php-major-version.sh
+
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/occ_manual_upgrade.sh b/occ_manual_upgrade.sh
index 7675238..85ba6d2 100755
--- a/occ_manual_upgrade.sh
+++ b/occ_manual_upgrade.sh
@@ -228,13 +228,33 @@ fi
 # -
 IFS=$CUR_IFS
 
-WEB_BASE_DIR="/var/www/${WEBSITE}"
+DEFAULT_SRC_BASE_DIR="/usr/local/src/nextcloud"
+DEFAULT_HTTP_USER="www-data"
+DEFAULT_HTTP_GROUP="www-data"
+DEFAULT_PHP_ENGINE='FPM'
+
+echo ""
+echononl "   Include Configuration file.."
+if [[ ! -f $conf_file ]]; then
+   echo_failed
+   fatal "Missing configuration file '$conf_file'."
+else
+   source $conf_file
+   echo_ok
+fi
+echo ""
+
+DEFAULT_WEB_BASE_DIR="/var/www/${WEBSITE}"
+[[ -n "$WEB_BASE_DIR" ]] || WEB_BASE_DIR=$DEFAULT_WEB_BASE_DIR
 
 if [[ ! -d ${WEB_BASE_DIR} ]] ; then
    fatal "Web base directory '$WEB_BASE_DIR' not found!"
 fi
 
 DATA_DIR="$(realpath ${WEB_BASE_DIR}/data)"
+
+[[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
+
 INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
@@ -293,11 +313,15 @@ APACHE2_IS_ENABLED=false
 source ${snippet_dir}/get-webservice-environment.sh
 
 
-if [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+# Check PHP Version
+#
+source ${snippet_dir}/get-php-major-version.sh
+
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/occ_update_apps.sh b/occ_update_apps.sh
index 6bc57ae..5988b95 100755
--- a/occ_update_apps.sh
+++ b/occ_update_apps.sh
@@ -228,13 +228,33 @@ fi
 # -
 IFS=$CUR_IFS
 
-WEB_BASE_DIR="/var/www/${WEBSITE}"
+DEFAULT_SRC_BASE_DIR="/usr/local/src/nextcloud"
+DEFAULT_HTTP_USER="www-data"
+DEFAULT_HTTP_GROUP="www-data"
+DEFAULT_PHP_ENGINE='FPM'
+
+echo ""
+echononl "   Include Configuration file.."
+if [[ ! -f $conf_file ]]; then
+   echo_failed
+   fatal "Missing configuration file '$conf_file'."
+else
+   source $conf_file
+   echo_ok
+fi
+echo ""
+
+DEFAULT_WEB_BASE_DIR="/var/www/${WEBSITE}"
+[[ -n "$WEB_BASE_DIR" ]] || WEB_BASE_DIR=$DEFAULT_WEB_BASE_DIR
 
 if [[ ! -d ${WEB_BASE_DIR} ]] ; then
    fatal "Web base directory '$WEB_BASE_DIR' not found!"
 fi
 
 DATA_DIR="$(realpath ${WEB_BASE_DIR}/data)"
+
+[[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
+
 INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
@@ -292,11 +312,15 @@ APACHE2_IS_ENABLED=false
 source ${snippet_dir}/get-webservice-environment.sh
 
 
-if [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then
-   PHP_BIN="/usr/local/php/bin/php"
-else
-   PHP_BIN="$(which php)"
-fi
+# Check PHP Version
+#
+source ${snippet_dir}/get-php-major-version.sh
+
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 if [[ ! -x "$PHP_BIN" ]]; then
    fatal "No PHP binary found!"
diff --git a/remove_user_from_group.sh b/remove_user_from_group.sh
index 576f5e0..0593968 100755
--- a/remove_user_from_group.sh
+++ b/remove_user_from_group.sh
@@ -334,6 +334,12 @@ source ${snippet_dir}/get-webservice-environment.sh
 #
 source ${snippet_dir}/get-php-major-version.sh
 
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud`
 CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data`
 CURRENT_VERSION=`basename $CURRENT_INSTALL_DIR | cut -d"-" -f2`
@@ -392,6 +398,8 @@ echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
 echo ""
+echo -e   "   PHP command..........................: $PHP_BIN"
+echo ""
 echo -e   "   Databse name.........................: $DATABASE_NAME"
 echo -e   "   Database type........................: $DATABASE_TYPE"
 echo ""
@@ -430,7 +438,7 @@ echo ""
 # -
 echononl "   Remove user \033[37m\033[1m$USER\033[m from group \033[37m\033[1m$GROUP\033[m .."
 
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'" -s /bin/bash $HTTP_USER > $log_file 2>&1
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'" -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
 else
@@ -438,7 +446,7 @@ else
    blank_line
    echo ""
    echo -e "\033[37m\033[1mcommandline was:\033[m"
-   echo -e "su -c \"/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'\" -s /bin/bash $HTTP_USER"
+   echo -e "su -c \"${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'\" -s /bin/bash $HTTP_USER"
    blank_line
    warn "Despite errors, it is possible that the user \033[37m\033[1m$USER\033[m was removed from the group \033[37m\033[1m$GROUP\033[m"
    fatal "$(cat $log_file)"
diff --git a/replace_favicon.sh b/replace_favicon.sh
index c41921f..fed3c2c 100755
--- a/replace_favicon.sh
+++ b/replace_favicon.sh
@@ -295,6 +295,16 @@ source ${snippet_dir}/get-webservice-environment.sh
 #
 source ${snippet_dir}/get-php-major-version.sh
 
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+if [[ ! -x "$PHP_BIN" ]]; then
+   fatal "No PHP binary found!"
+fi
+
+
 echo ""
 echo -e "   \033[32m--\033[m"
 echo ""
@@ -347,6 +357,8 @@ echo -e   "   Webserver group......................: $HTTP_GROUP"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 
 echo ""
 echo -n "   Type upper case 'YES' to continue executing with this parameters: "
@@ -376,7 +388,7 @@ echo ""
 # - Create missing indices
 # -
 echononl "   Replace Favicon Icon with \033[1m$(basename ${CUSTOM_FAVICON_PATH})\033[m .."
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ theming:config favicon ${CUSTOM_FAVICON_PATH}" \
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ theming:config favicon ${CUSTOM_FAVICON_PATH}" \
    -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
diff --git a/replace_logo.sh b/replace_logo.sh
index 4337f37..a8f8d5a 100755
--- a/replace_logo.sh
+++ b/replace_logo.sh
@@ -223,6 +223,16 @@ echo -e "\033[32m-----\033[m"
 source ${snippet_dir}/get-cloud-instance-to-update.sh
 
 
+# Check PHP Version
+#
+source ${snippet_dir}/get-php-major-version.sh
+
+
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 # - Reset IFS
 # -
 IFS=$CUR_IFS
@@ -296,6 +306,11 @@ source ${snippet_dir}/get-webservice-environment.sh
 source ${snippet_dir}/get-php-major-version.sh
 
 
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 echo ""
 echo -e "   \033[32m--\033[m"
 echo ""
@@ -348,6 +363,8 @@ echo -e   "   Webserver group......................: $HTTP_GROUP"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 
 echo ""
 echo -n "   Type upper case 'YES' to continue executing with this parameters: "
@@ -377,7 +394,7 @@ echo ""
 # - Create missing indices
 # -
 echononl "   Replace Logo with \033[1m$(basename ${CUSTOM_LOGO_PATH})\033[m .."
-su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ theming:config logo ${CUSTOM_LOGO_PATH}" \
+su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ theming:config logo ${CUSTOM_LOGO_PATH}" \
    -s /bin/bash $HTTP_USER > $log_file 2>&1
 if [[ $? -eq 0 ]]; then
    echo_ok
diff --git a/restore_nextcloud.sh b/restore_nextcloud.sh
index 56cdfc7..b13342b 100755
--- a/restore_nextcloud.sh
+++ b/restore_nextcloud.sh
@@ -301,25 +301,9 @@ source ${snippet_dir}/get-webservice-environment.sh
 source ${snippet_dir}/get-php-major-version.sh
 
 
-
-# - Determin PHP binary
-# -
-if [[ -x "/usr/local/php-${PHP_VERSION}/bin/php" ]] ; then
-   php_binary="/usr/local/php-${PHP_VERSION}/bin/php"
-else
-   php_binary="$(realpath "$(which php)")"
-   if [[ -z "$php_binary" ]]; then
-      if [[ -x "/usr/local/php/bin/php" ]]; then
-         php_binary="/usr/local/php/bin/php"
-      else
-         fatal "No PHP binary present"
-      fi
-   else
-      if [[ ! -x "$php_binary" ]]; then
-         fatal "Found PHP binary '$php_binary', but this file is not executable!"
-      fi
-   fi
-fi
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
 
 
 
@@ -371,7 +355,7 @@ read _IN
 done
 
 CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud`
-CURRENT_VERSION="$(sudo -u $HTTP_USER $php_binary ${WEB_BASE_DIR}/htdocs/occ --version | cut -d' ' -f2)"
+CURRENT_VERSION="$(sudo -u $HTTP_USER ${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ --version | cut -d' ' -f2)"
 
 DATA_DIR=${WEB_BASE_DIR}/data
 
@@ -389,7 +373,8 @@ echo -e   "   Webserver user.......................: $HTTP_USER"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
-echo -e   "   PHP binary...........................: $php_binary"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 echo ""
 echo -e   "   Version to rstore....................: $RESTORE_VERSION"
 echo -e   "   Backup date was......................: $DATE_RESTORE_VERSION"
diff --git a/snippets/get-path-of-php-command.sh b/snippets/get-path-of-php-command.sh
new file mode 100644
index 0000000..25d4e36
--- /dev/null
+++ b/snippets/get-path-of-php-command.sh
@@ -0,0 +1,7 @@
+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
+   PHP_BIN="/usr/local/php/bin/php"
+else
+   PHP_BIN="$(which php)"
+fi
diff --git a/update_nextcloud.sh b/update_nextcloud.sh
index 82d6c11..0e6fd0a 100755
--- a/update_nextcloud.sh
+++ b/update_nextcloud.sh
@@ -252,6 +252,11 @@ echo -e "\033[32m-----\033[m"
 source ${snippet_dir}/get-cloud-instance-to-update.sh
 
 
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
+
 # - Reset IFS
 # -
 IFS=$CUR_IFS
@@ -386,24 +391,10 @@ source ${snippet_dir}/get-webservice-environment.sh
 source ${snippet_dir}/get-php-major-version.sh
 
 
-# - Determin PHP binary
-# -
-if [[ -x "/usr/local/php-${PHP_VERSION}/bin/php" ]] ; then
-   php_binary="/usr/local/php-${PHP_VERSION}/bin/php"
-else
-   php_binary="$(realpath "$(which php)")"
-   if [[ -z "$php_binary" ]]; then
-      if [[ -x "/usr/local/php/bin/php" ]]; then
-         php_binary="/usr/local/php/bin/php"
-      else
-         fatal "No PHP binary present"
-      fi
-   else
-      if [[ ! -x "$php_binary" ]]; then
-         fatal "Found PHP binary '$php_binary', but this file is not executable!"
-      fi
-   fi
-fi
+# Get full qualified PHP command
+#
+source ${snippet_dir}/get-path-of-php-command.sh
+
 
 # ---
 
@@ -452,7 +443,8 @@ echo -e   "   Webserver user.......................: $HTTP_USER"
 echo ""
 echo -e   "   PHP version..........................: $PHP_VERSION"
 echo -e   "   PHP Engine...........................: $PHP_ENGINE"
-echo -e   "   PHP binary...........................: $php_binary"
+echo ""
+echo -e   "   PHP Command..........................: $PHP_BIN"
 echo ""
 echo -e   "   Databse name.........................: $DATABASE_NAME"
 echo -e   "   Database type........................: $DATABASE_TYPE"
@@ -897,7 +889,7 @@ fi
 #_app="calendar"
 #
 #echononl "Install nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -920,7 +912,7 @@ fi
 #fi
 #
 #echononl "Eanable nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -946,7 +938,7 @@ fi
 #_app="contacts"
 #
 #echononl "Install nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -969,7 +961,7 @@ fi
 #fi
 #
 #echononl "Enable nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -995,7 +987,7 @@ fi
 #_app="notes"
 #
 #echononl "Install nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -1018,7 +1010,7 @@ fi
 #fi
 #
 #echononl "Eanable nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -1044,7 +1036,7 @@ fi
 #_app="tasks"
 #
 #echononl "Install nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
@@ -1068,7 +1060,7 @@ fi
 #fi
 #
 #echononl "Eanable nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -1096,7 +1088,7 @@ fi
 #   _app="richdocuments"
 #
 #   echononl "Install nextcloud app '$_app'.."
-#   sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#   sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #   if [[ $? -eq 0 ]]; then
 #      echo_ok
 #   else
@@ -1119,7 +1111,7 @@ fi
 #   fi
 #
 #   echononl "Eanable nextcloud app '$_app'.."
-#   sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#   sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #   if [[ $? -eq 0 ]]; then
 #      echo_ok
 #   else
@@ -1142,7 +1134,7 @@ fi
 #      echo_skipped
 #      error "No Wopi URL given (variable 'WOPI_URL')."
 #   else
-#      sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" config:app:set richdocuments wopi_url --value="$WOPI_URL" >> $log_file 2>&1
+#      sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" config:app:set richdocuments wopi_url --value="$WOPI_URL" >> $log_file 2>&1
 #      if [[ $? -eq 0 ]]; then
 #         echo_ok
 #      else
@@ -1170,7 +1162,7 @@ fi
 #_app="bruteforcesettings"
 #
 #echononl "Install nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -1193,7 +1185,7 @@ fi
 #fi
 #
 #echononl "Eanable nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
@@ -1217,7 +1209,7 @@ fi
 #_app="announcementcenter"
 #
 #echononl "Install nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
 #if [[ $? -eq 0 ]]; then
 #   echo_ok
 #else
@@ -1240,7 +1232,7 @@ fi
 #fi
 #
 #echononl "Eanable nextcloud app '$_app'.."
-#sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
+#sudo -u "$HTTP_USER" "${PHP_BIN}" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
 #
 #if [[ $? -eq 0 ]]; then
 #   echo_ok