Skip to content

Commit 090d150

Browse files
committed
Add php version number and remove missing sed excludes.
1 parent 5896023 commit 090d150

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

install/hst-install-debian.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ if [ "$apache" = 'no' ]; then
757757
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
758758
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
759759
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
760-
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
760+
software=$(echo "$software" | sed -e "s/libapache2-mod-php$fpm_v//")
761761
fi
762762
if [ "$vsftpd" = 'no' ]; then
763763
software=$(echo "$software" | sed -e "s/vsftpd//")
@@ -798,23 +798,12 @@ if [ "$mysql" = 'no' ]; then
798798
software=$(echo "$software" | sed -e "s/mariadb-client//")
799799
software=$(echo "$software" | sed -e "s/mariadb-common//")
800800
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
801-
if [ "$multiphp" = 'yes' ]; then
802-
for v in "${multiphp_v[@]}"; do
803-
software=$(echo "$software" | sed -e "s/php$v-mysql//")
804-
software=$(echo "$software" | sed -e "s/php$v-bz2//")
805-
done
806-
fi
807801
software=$(echo "$software" | sed -e "s/phpmyadmin//")
808802
fi
809803
if [ "$postgresql" = 'no' ]; then
810804
software=$(echo "$software" | sed -e "s/postgresql-contrib//")
811805
software=$(echo "$software" | sed -e "s/postgresql//")
812806
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
813-
if [ "$multiphp" = 'yes' ]; then
814-
for v in "${multiphp_v[@]}"; do
815-
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
816-
done
817-
fi
818807
software=$(echo "$software" | sed -e "s/phppgadmin//")
819808
fi
820809
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then

0 commit comments

Comments
 (0)