Просмотр исходного кода

Merge branch 'fix-installer-string-0706' into installer-update-0706

Kristan Kenney 5 лет назад
Родитель
Сommit
1e2d57c149
2 измененных файлов с 11 добавлено и 3 удалено
  1. 6 2
      install/hst-install-debian.sh
  2. 5 1
      install/hst-install-ubuntu.sh

+ 6 - 2
install/hst-install-debian.sh

@@ -862,7 +862,7 @@ echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
 chmod a+x /usr/sbin/policy-rc.d
 
 # Installing apt packages
-echo "Now installing Hestia Control Panel and all required dependencies."
+echo "The installer is now downloading and installing all required packages."
 echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
 echo
 apt-get -y install $software > /dev/null 2>&1 &
@@ -882,6 +882,10 @@ echo
 wait $BACK_PID
 check_result $? "apt-get install failed"
 
+echo
+echo "========================================================================"
+echo
+
 # Install Hestia packages from local folder
 if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
     echo "(*) Installing local package files..."
@@ -908,11 +912,11 @@ fi
 # Restoring autostart policy
 rm -f /usr/sbin/policy-rc.d
 
-
 #----------------------------------------------------------#
 #                     Configure system                     #
 #----------------------------------------------------------#
 
+
 echo "(*) Configuring system settings..."
 # Enable SSH password authentication
 sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config

+ 5 - 1
install/hst-install-ubuntu.sh

@@ -860,7 +860,7 @@ echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
 chmod a+x /usr/sbin/policy-rc.d
 
 # Installing apt packages
-echo "Now installing Hestia Control Panel and all required dependencies."
+echo "The installer is now downloading and installing all required packages."
 echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
 echo
 apt-get -y install $software > /dev/null 2>&1 &
@@ -880,6 +880,10 @@ echo
 wait $BACK_PID
 check_result $? "apt-get install failed"
 
+echo
+echo "========================================================================"
+echo
+
 # Install Hestia packages from local folder
 if [ ! -z "$withdebs" ] && [ -d "$withdebs" ]; then
     echo "(*) Installing local package files..."