Browse Source

Revert "Do not exclude default PHP version during Multi-PHP installation"

This reverts commit 53850b50738e871f101ddd39f184a4828b02a862.
Raphael Schneeberger 6 years ago
parent
commit
9dc700d76b
2 changed files with 32 additions and 0 deletions
  1. 16 0
      install/hst-install-debian.sh
  2. 16 0
      install/hst-install-ubuntu.sh

+ 16 - 0
install/hst-install-debian.sh

@@ -828,6 +828,22 @@ if [ "$phpfpm" = 'yes' ]; then
     software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
     software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
 fi
+if [ "$multiphp" = 'yes' ]; then
+    software=$(echo "$software" | sed -e "s/ php$fpm_v //")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-auth-sasl//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-mail-mime//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-net-sieve//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-net-smtp//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-net-socket//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-pear//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-php-gettext//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-phpseclib//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
+fi
 if [ -d "$withdebs" ]; then
     software=$(echo "$software" | sed -e "s/hestia-nginx//")
     software=$(echo "$software" | sed -e "s/hestia-php//")

+ 16 - 0
install/hst-install-ubuntu.sh

@@ -782,6 +782,22 @@ if [ "$phpfpm" = 'yes' ]; then
     software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
     software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
 fi
+if [ "$multiphp" = 'yes' ]; then
+    software=$(echo "$software" | sed -e "s/ php$fpm_v //")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-auth-sasl//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-mail-mime//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-net-sieve//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-net-smtp//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-net-socket//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-pear//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-php-gettext//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-phpseclib//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
+fi
 if [ -d "$withdebs" ]; then
     software=$(echo "$software" | sed -e "s/hestia-nginx//")
     software=$(echo "$software" | sed -e "s/hestia-php//")