Skip to content

Commit 1e2d57c

Browse files
author
Kristan Kenney
committed
Merge branch 'fix-installer-string-0706' into installer-update-0706
2 parents b0b56a2 + 9fbbf95 commit 1e2d57c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

install/hst-install-debian.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
862862
chmod a+x /usr/sbin/policy-rc.d
863863

864864
# Installing apt packages
865-
echo "Now installing Hestia Control Panel and all required dependencies."
865+
echo "The installer is now downloading and installing all required packages."
866866
echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
867867
echo
868868
apt-get -y install $software > /dev/null 2>&1 &
@@ -882,6 +882,10 @@ echo
882882
wait $BACK_PID
883883
check_result $? "apt-get install failed"
884884

885+
echo
886+
echo "========================================================================"
887+
echo
888+
885889
# Install Hestia packages from local folder
886890
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
887891
echo "(*) Installing local package files..."
@@ -908,11 +912,11 @@ fi
908912
# Restoring autostart policy
909913
rm -f /usr/sbin/policy-rc.d
910914

911-
912915
#----------------------------------------------------------#
913916
# Configure system #
914917
#----------------------------------------------------------#
915918

919+
916920
echo "(*) Configuring system settings..."
917921
# Enable SSH password authentication
918922
sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config

install/hst-install-ubuntu.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
860860
chmod a+x /usr/sbin/policy-rc.d
861861

862862
# Installing apt packages
863-
echo "Now installing Hestia Control Panel and all required dependencies."
863+
echo "The installer is now downloading and installing all required packages."
864864
echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
865865
echo
866866
apt-get -y install $software > /dev/null 2>&1 &
@@ -880,6 +880,10 @@ echo
880880
wait $BACK_PID
881881
check_result $? "apt-get install failed"
882882

883+
echo
884+
echo "========================================================================"
885+
echo
886+
883887
# Install Hestia packages from local folder
884888
if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
885889
echo "(*) Installing local package files..."

0 commit comments

Comments
 (0)