Skip to content

Commit e30184b

Browse files
committed
Change package installation way of multiphp.
1 parent 9eae24d commit e30184b

File tree

2 files changed

+38
-26
lines changed

2 files changed

+38
-26
lines changed

install/hst-install-debian.sh

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -629,19 +629,19 @@ fi
629629
#----------------------------------------------------------#
630630

631631
if [ "$multiphp" = 'yes' ]; then
632-
software+="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
633-
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
634-
php5.6-soap php5.6-xml php5.6-zip php5.6-memcache php5.6-memcached
635-
php5.6-zip php7.0-apcu php7.0-mbstring php7.0-bcmath php7.0-cli
636-
php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
637-
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.0-memcache
638-
php7.0-memcached php7.0-zip php7.1-apcu php7.1-mbstring
639-
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd
640-
php7.1-intl php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml
641-
php7.1-zip php7.1-memcache php7.1-memcached php7.1-zip
642-
php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
643-
php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
644-
php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
632+
mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
633+
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
634+
php5.6-soap php5.6-xml php5.6-zip php5.6-memcache php5.6-memcached
635+
php5.6-zip php7.0-apcu php7.0-mbstring php7.0-bcmath php7.0-cli
636+
php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
637+
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.0-memcache
638+
php7.0-memcached php7.0-zip php7.1-apcu php7.1-mbstring
639+
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd
640+
php7.1-intl php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml
641+
php7.1-zip php7.1-memcache php7.1-memcached php7.1-zip
642+
php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
643+
php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
644+
php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
645645
fi
646646

647647
#----------------------------------------------------------#
@@ -659,6 +659,12 @@ chmod a+x /usr/sbin/policy-rc.d
659659
apt-get -y install $software
660660
check_result $? "apt-get install failed"
661661

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+
662668
# Restore policy
663669
rm -f /usr/sbin/policy-rc.d
664670

install/hst-install-ubuntu.sh

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -622,19 +622,19 @@ fi
622622
#----------------------------------------------------------#
623623

624624
if [ "$multiphp" = 'yes' ]; then
625-
software+="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
626-
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
627-
php5.6-soap php5.6-xml php5.6-zip php5.6-memcache php5.6-memcached
628-
php5.6-zip php7.0-apcu php7.0-mbstring php7.0-bcmath php7.0-cli
629-
php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
630-
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.0-memcache
631-
php7.0-memcached php7.0-zip php7.1-apcu php7.1-mbstring
632-
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd
633-
php7.1-intl php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml
634-
php7.1-zip php7.1-memcache php7.1-memcached php7.1-zip
635-
php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
636-
php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
637-
php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
625+
mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
626+
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
627+
php5.6-soap php5.6-xml php5.6-zip php5.6-memcache php5.6-memcached
628+
php5.6-zip php7.0-apcu php7.0-mbstring php7.0-bcmath php7.0-cli
629+
php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
630+
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.0-memcache
631+
php7.0-memcached php7.0-zip php7.1-apcu php7.1-mbstring
632+
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd
633+
php7.1-intl php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml
634+
php7.1-zip php7.1-memcache php7.1-memcached php7.1-zip
635+
php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
636+
php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
637+
php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
638638
fi
639639

640640
#----------------------------------------------------------#
@@ -652,6 +652,12 @@ chmod a+x /usr/sbin/policy-rc.d
652652
apt-get -y install $software
653653
check_result $? "apt-get install failed"
654654

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+
655661
# Restoring autostart policy
656662
rm -f /usr/sbin/policy-rc.d
657663

0 commit comments

Comments
 (0)