Skip to content

Commit 9bdde12

Browse files
committed
Small rewrite in software+mph var.
1 parent 9a24561 commit 9bdde12

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

install/hst-install-debian.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@ if [ "$multiphp" = 'yes' ]; then
642642
php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
643643
php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
644644
php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
645+
software="$software $mph"
645646
fi
646647

647648
#----------------------------------------------------------#
@@ -659,12 +660,6 @@ chmod a+x /usr/sbin/policy-rc.d
659660
apt-get -y install $software
660661
check_result $? "apt-get install failed"
661662

662-
# Install multiphp packages
663-
if [ "$multiphp" = 'yes' ]; then
664-
apt-get -y install $mph
665-
check_result $? "apt-get install failed"
666-
fi
667-
668663
# Restore policy
669664
rm -f /usr/sbin/policy-rc.d
670665

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ if [ "$multiphp" = 'yes' ]; then
635635
php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
636636
php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
637637
php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
638+
software="$software $mph"
638639
fi
639640

640641
#----------------------------------------------------------#
@@ -652,12 +653,6 @@ chmod a+x /usr/sbin/policy-rc.d
652653
apt-get -y install $software
653654
check_result $? "apt-get install failed"
654655

655-
# Install multiphp packages
656-
if [ "$multiphp" = 'yes' ]; then
657-
apt-get -y install $mph
658-
check_result $? "apt-get install failed"
659-
fi
660-
661656
# Restoring autostart policy
662657
rm -f /usr/sbin/policy-rc.d
663658

0 commit comments

Comments
 (0)