Add snippet 'get-path-of-php-command.sh' and change concerning code..

2023-08-03 00:11:02 +02:00
parent 1df7bb124b
commit d84294cf0b
18 changed files with 287 additions and 117 deletions
--- 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