Skip to content

Commit 4f4ddeb

Browse files
committed
Revert apt fix issue and modify php sed to prevent wrong replace.
1 parent c169f01 commit 4f4ddeb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

install/hst-install-debian.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
707707
software=$(echo "$software" | sed -e 's/fail2ban//')
708708
fi
709709
if [ "$phpfpm" = 'yes' ]; then
710-
software=$(echo "$software" | sed -e 's/php//')
710+
software=$(echo "$software" | sed -e 's/ php //')
711711
software=$(echo "$software" | sed -e 's/php-pgsql//')
712712
software=$(echo "$software" | sed -e 's/php-curl//')
713713
software=$(echo "$software" | sed -e 's/php-common//')
@@ -729,7 +729,7 @@ chmod a+x /usr/sbin/policy-rc.d
729729

730730
# Installing apt packages
731731
echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
732-
apt-get -y --allow-change-held-packages install $software > /dev/null 2>&1 &
732+
apt-get -y install $software > /dev/null 2>&1 &
733733
BACK_PID=$!
734734

735735
# Check if package installation is done, print a spinner

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
682682
software=$(echo "$software" | sed -e 's/fail2ban//')
683683
fi
684684
if [ "$phpfpm" = 'yes' ]; then
685-
software=$(echo "$software" | sed -e 's/php//')
685+
software=$(echo "$software" | sed -e 's/ php //')
686686
software=$(echo "$software" | sed -e 's/php-pgsql//')
687687
software=$(echo "$software" | sed -e 's/php-curl//')
688688
software=$(echo "$software" | sed -e 's/php-common//')
@@ -704,7 +704,7 @@ chmod a+x /usr/sbin/policy-rc.d
704704

705705
# Installing apt packages
706706
echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
707-
apt-get -y --allow-change-held-packages install $software > /dev/null 2>&1 &
707+
apt-get -y install $software > /dev/null 2>&1 &
708708
BACK_PID=$!
709709

710710
# Check if package installation is done, print a spinner

0 commit comments

Comments
 (0)