Skip to content

Commit f26cac0

Browse files
author
Kristan Kenney
committed
Do not exclude default PHP version during Multi-PHP installation
Prevents PHP 7.4 from being incorrectly pulled in as default version when 7.3 is specified as default during installation.
1 parent 7469b84 commit f26cac0

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

install/hst-install-debian.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -828,22 +828,6 @@ 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
847831
if [ -d "$withdebs" ]; then
848832
software=$(echo "$software" | sed -e "s/hestia-nginx//")
849833
software=$(echo "$software" | sed -e "s/hestia-php//")

install/hst-install-ubuntu.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -782,22 +782,6 @@ 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
801785
if [ -d "$withdebs" ]; then
802786
software=$(echo "$software" | sed -e "s/hestia-nginx//")
803787
software=$(echo "$software" | sed -e "s/hestia-php//")

0 commit comments

Comments
 (0)