Skip to content

Commit be69edc

Browse files
committed
Implement better handling for php fpm installation conditions.
1 parent 8ce248c commit be69edc

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

install/hst-install-debian.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ rm -rf $HESTIA > /dev/null 2>&1
643643
#----------------------------------------------------------#
644644

645645
if [ "$multiphp" = 'yes' ]; then
646+
fpm_added=false
646647
for v in "${multiphp_v[@]}"; do
647648
if [ "$v" = "$fpm_v" ]; then
648649
fpm_added=true
@@ -656,9 +657,16 @@ if [ "$multiphp" = 'yes' ]; then
656657
fi
657658
software="$software $mph"
658659
done
660+
if [ "$fpm_added" = false ]; then
661+
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
662+
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
663+
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
664+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
665+
software="$software $fpm"
666+
fi
659667
fi
660668

661-
if [ "$phpfpm" = 'yes' ] || [ "$fpm_added" ]; then
669+
if [ "$phpfpm" = 'yes' ]; then
662670
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
663671
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
664672
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip

install/hst-install-ubuntu.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ rm -rf $HESTIA > /dev/null 2>&1
610610
#----------------------------------------------------------#
611611

612612
if [ "$multiphp" = 'yes' ]; then
613+
fpm_added=false
613614
for v in "${multiphp_v[@]}"; do
614615
if [ "$v" = "$fpm_v" ]; then
615616
fpm_added=true
@@ -623,9 +624,16 @@ if [ "$multiphp" = 'yes' ]; then
623624
fi
624625
software="$software $mph"
625626
done
627+
if [ "$fpm_added" = false ]; then
628+
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
629+
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
630+
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
631+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
632+
software="$software $fpm"
633+
fi
626634
fi
627635

628-
if [ "$phpfpm" = 'yes' ] || [ "$fpm_added" ]; then
636+
if [ "$phpfpm" = 'yes' ]; then
629637
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
630638
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
631639
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip

0 commit comments

Comments
 (0)