Skip to content

Commit 9dc700d

Browse files
committed
Revert "Do not exclude default PHP version during Multi-PHP installation"
This reverts commit 53850b5.
1 parent 59a59c6 commit 9dc700d

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

install/hst-install-debian.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,22 @@ if [ "$phpfpm" = 'yes' ]; then
828828
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
829829
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
830830
fi
831+
if [ "$multiphp" = 'yes' ]; then
832+
software=$(echo "$software" | sed -e "s/ php$fpm_v //")
833+
software=$(echo "$software" | sed -e "s/php$fpm_v-auth-sasl//")
834+
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
835+
software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
836+
software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
837+
software=$(echo "$software" | sed -e "s/php$fpm_v-mail-mime//")
838+
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
839+
software=$(echo "$software" | sed -e "s/php$fpm_v-net-sieve//")
840+
software=$(echo "$software" | sed -e "s/php$fpm_v-net-smtp//")
841+
software=$(echo "$software" | sed -e "s/php$fpm_v-net-socket//")
842+
software=$(echo "$software" | sed -e "s/php$fpm_v-pear//")
843+
software=$(echo "$software" | sed -e "s/php$fpm_v-php-gettext//")
844+
software=$(echo "$software" | sed -e "s/php$fpm_v-phpseclib//")
845+
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
846+
fi
831847
if [ -d "$withdebs" ]; then
832848
software=$(echo "$software" | sed -e "s/hestia-nginx//")
833849
software=$(echo "$software" | sed -e "s/hestia-php//")

install/hst-install-ubuntu.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,22 @@ if [ "$phpfpm" = 'yes' ]; then
782782
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
783783
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
784784
fi
785+
if [ "$multiphp" = 'yes' ]; then
786+
software=$(echo "$software" | sed -e "s/ php$fpm_v //")
787+
software=$(echo "$software" | sed -e "s/php$fpm_v-auth-sasl//")
788+
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
789+
software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
790+
software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
791+
software=$(echo "$software" | sed -e "s/php$fpm_v-mail-mime//")
792+
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
793+
software=$(echo "$software" | sed -e "s/php$fpm_v-net-sieve//")
794+
software=$(echo "$software" | sed -e "s/php$fpm_v-net-smtp//")
795+
software=$(echo "$software" | sed -e "s/php$fpm_v-net-socket//")
796+
software=$(echo "$software" | sed -e "s/php$fpm_v-pear//")
797+
software=$(echo "$software" | sed -e "s/php$fpm_v-php-gettext//")
798+
software=$(echo "$software" | sed -e "s/php$fpm_v-phpseclib//")
799+
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
800+
fi
785801
if [ -d "$withdebs" ]; then
786802
software=$(echo "$software" | sed -e "s/hestia-nginx//")
787803
software=$(echo "$software" | sed -e "s/hestia-php//")

0 commit comments

Comments
 (0)