Skip to content

Commit b0b56a2

Browse files
author
Kristan Kenney
committed
Merge branch 'fix-installer-string-0706' into installer-update-0706
2 parents a877f39 + 642bbb7 commit b0b56a2

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

install/hst-install-debian.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -884,18 +884,24 @@ check_result $? "apt-get install failed"
884884

885885
# Install Hestia packages from local folder
886886
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
887-
dpkg -i $withdebs/hestia_*.deb
887+
echo "(*) Installing local package files..."
888+
echo " - hestia core package"
889+
dpkg -i $withdebs/hestia_*.deb > /dev/null 2>&1
888890

889891
if [ -z $(ls $withdebs/hestia-php_*.deb 2>/dev/null) ]; then
892+
echo " - hestia-php backend package (from apt)"
890893
apt-get -y install hestia-php > /dev/null 2>&1
891894
else
892-
dpkg -i $withdebs/hestia-php_*.deb
895+
echo " - hestia-php backend package"
896+
dpkg -i $withdebs/hestia-php_*.deb > /dev/null 2>&1
893897
fi
894898

895899
if [ -z $(ls $withdebs/hestia-nginx_*.deb 2>/dev/null) ]; then
900+
echo " - hestia-nginx backend package (from apt)"
896901
apt-get -y install hestia-nginx > /dev/null 2>&1
897902
else
898-
dpkg -i $withdebs/hestia-nginx_*.deb
903+
echo " - hestia-nginx backend package"
904+
dpkg -i $withdebs/hestia-nginx_*.deb > /dev/null 2>&1
899905
fi
900906
fi
901907

install/hst-install-ubuntu.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,18 +882,24 @@ check_result $? "apt-get install failed"
882882

883883
# Install Hestia packages from local folder
884884
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
885-
dpkg -i $withdebs/hestia_*.deb
885+
echo "(*) Installing local package files..."
886+
echo " - hestia core package"
887+
dpkg -i $withdebs/hestia_*.deb > /dev/null 2>&1
886888

887889
if [ -z $(ls $withdebs/hestia-php_*.deb 2>/dev/null) ]; then
890+
echo " - hestia-php backend package (from apt)"
888891
apt-get -y install hestia-php > /dev/null 2>&1
889892
else
890-
dpkg -i $withdebs/hestia-php_*.deb
893+
echo " - hestia-php backend package"
894+
dpkg -i $withdebs/hestia-php_*.deb > /dev/null 2>&1
891895
fi
892896

893897
if [ -z $(ls $withdebs/hestia-nginx_*.deb 2>/dev/null) ]; then
898+
echo " - hestia-nginx backend package (from apt)"
894899
apt-get -y install hestia-nginx > /dev/null 2>&1
895900
else
896-
dpkg -i $withdebs/hestia-nginx_*.deb
901+
echo " - hestia-nginx backend package"
902+
dpkg -i $withdebs/hestia-nginx_*.deb > /dev/null 2>&1
897903
fi
898904
fi
899905

0 commit comments

Comments
 (0)