Merge branch 'bugfix-installer' into develop

Author: Kristan Kenney

install/hst-install-debian.sh

@@ -86,6 +86,10 @@ help() {
     exit 1
 }
 
+# Define file download function
+download_file() {
+  wget $1 -q --show-progress --progress=bar:force
+}
 
 # Defining password-gen function
 gen_pass() {
@@ -903,9 +907,9 @@ chmod 440 /etc/sudoers.d/admin
 echo "export HESTIA='$HESTIA'" > /etc/profile.d/hestia.sh
 chmod 755 /etc/profile.d/hestia.sh
 source /etc/profile.d/hestia.sh
-echo 'PATH=$PATH:'$HESTIA'/bin' >> /root/.bash_profile
-echo 'export PATH' >> /root/.bash_profile
-source /root/.bash_profile
+echo 'PATH=$PATH:'$HESTIA'/bin' >> /etc/profile
+echo 'export PATH' >> /etc/profile
+source /etc/profile
 
 # Configuring logrotate for Hestia logs
 cp -f $hestiacp/logrotate/hestia /etc/logrotate.d/hestia

install/hst-install-ubuntu.sh

@@ -71,6 +71,10 @@ help() {
     exit 1
 }
 
+# Define file download function
+download_file() {
+  wget $1 -q --show-progress --progress=bar:force
+}
 
 # Defining password-gen function
 gen_pass() {
@@ -878,9 +882,9 @@ chmod 440 /etc/sudoers.d/admin
 echo "export HESTIA='$HESTIA'" > /etc/profile.d/hestia.sh
 chmod 755 /etc/profile.d/hestia.sh
 source /etc/profile.d/hestia.sh
-echo 'PATH=$PATH:'$HESTIA'/bin' >> /root/.bash_profile
-echo 'export PATH' >> /root/.bash_profile
-source /root/.bash_profile
+echo 'PATH=$PATH:'$HESTIA'/bin' >> /etc/profile
+echo 'export PATH' >> /etc/profile
+source /etc/profile
 
 # Configuring logrotate for Hestia logs
 cp -f $hestiacp/logrotate/hestia /etc/logrotate.d/hestia