Просмотр исходного кода

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.
Kristan Kenney 6 лет назад
Родитель
Сommit
f26cac04e7
2 измененных файлов с 0 добавлено и 32 удалено
  1. 0 16
      install/hst-install-debian.sh
  2. 0 16
      install/hst-install-ubuntu.sh

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

@@ -828,22 +828,6 @@ 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//")

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

@@ -782,22 +782,6 @@ 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//")