Skip to content

Commit 57404b9

Browse files
author
Kristan Kenney
committed
Add welcome message to pre-launch and clean up display of install items
1 parent cf19783 commit 57404b9

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

install/hst-install-debian.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,37 +289,43 @@ if [ ! -f /etc/apt/apt.conf.d/80-retries ]; then
289289
echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
290290
fi
291291

292+
# Welcome message
293+
echo "Welcome to the Hestia Control Panel installer!"
294+
echo
295+
echo "Please wait a moment while we update your system's repositories and"
296+
echo "install any necessary dependencies required to proceed with the installation..."
297+
echo
298+
292299
# Update apt repository
293-
echo "Please wait a moment while we update your systems APT repositories..."
294300
apt-get -qq update
295301

296302
# Creating backup directory
297303
mkdir -p $hst_backups
298304

299305
# Checking ntpdate
300306
if [ ! -e '/usr/sbin/ntpdate' ]; then
301-
echo "Install missing ntpdate..."
307+
echo "(*) Installing ntpdate..."
302308
apt-get -y install ntpdate >> $LOG
303309
check_result $? "Can't install ntpdate"
304310
fi
305311

306312
# Checking wget
307313
if [ ! -e '/usr/bin/wget' ]; then
308-
echo "Install missing wget..."
314+
echo "(*) Installing wget..."
309315
apt-get -y install wget >> $LOG
310316
check_result $? "Can't install wget"
311317
fi
312318

313319
# Checking dirmngr
314320
if [ ! -e '/usr/bin/dirmngr' ]; then
315-
echo "Install missing dirmngr..."
321+
echo "(*) Installing dirmngr..."
316322
apt-get -y install dirmngr >> $LOG
317323
check_result $? "Can't install dirmngr"
318324
fi
319325

320326
# Check if apt-transport-https is installed
321327
if [ ! -e '/usr/lib/apt/methods/https' ]; then
322-
echo "Install missing apt-transport-https..."
328+
echo "(*) Installing apt-transport-https..."
323329
apt-get -y install apt-transport-https >> $LOG
324330
check_result $? "Can't install apt-transport-https"
325331
fi
@@ -1145,7 +1151,7 @@ if [ "$nginx" = 'yes' ]; then
11451151
mkdir -p /etc/nginx/conf.d/domains
11461152
mkdir -p /var/log/nginx/domains
11471153
if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ]; then
1148-
echo "(*) Configuring Multi-PHP..."
1154+
echo "(*) Configuring Multi-PHP for NGINX..."
11491155
rm -fr $HESTIA/data/templates/web/nginx/*
11501156
for v in "${multiphp_v[@]}"; do
11511157
update-rc.d php$v-fpm defaults > /dev/null 2>&1
@@ -1212,7 +1218,7 @@ if [ "$apache" = 'yes' ]; then
12121218
chmod 640 /var/log/apache2/access.log /var/log/apache2/error.log
12131219
chmod 751 /var/log/apache2/domains
12141220
if [ "$multiphp" = 'yes' ] ; then
1215-
echo "Configure Apache MultiPHP"
1221+
echo "(*) Configuring Multi-PHP for Apache..."
12161222
a2enmod proxy_fcgi setenvif > /dev/null 2>&1
12171223
for v in "${multiphp_v[@]}"; do
12181224
a2enconf php$v-fpm-fpm > /dev/null 2>&1

install/hst-install-ubuntu.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,37 +274,43 @@ if [ ! -f /etc/apt/apt.conf.d/80-retries ]; then
274274
echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
275275
fi
276276

277+
# Welcome message
278+
echo "Welcome to the Hestia Control Panel installer!"
279+
echo
280+
echo "Please wait a moment while we update your system's repositories and"
281+
echo "install any necessary dependencies required to proceed with the installation..."
282+
echo
283+
277284
# Update apt repository
278-
echo "Please wait a moment while we update your systems APT repositories..."
279285
apt-get -qq update
280286

281287
# Creating backup directory
282288
mkdir -p $hst_backups
283289

284290
# Checking ntpdate
285291
if [ ! -e '/usr/sbin/ntpdate' ]; then
286-
echo "Install missing ntpdate..."
292+
echo "(*) Installing ntpdate..."
287293
apt-get -y install ntpdate >> $LOG
288294
check_result $? "Can't install ntpdate"
289295
fi
290296

291297
# Checking wget
292298
if [ ! -e '/usr/bin/wget' ]; then
293-
echo "Install missing wget..."
299+
echo "(*) Installing wget..."
294300
apt-get -y install wget >> $LOG
295301
check_result $? "Can't install wget"
296302
fi
297303

298304
# Check if apt-transport-https is installed
299305
if [ ! -e '/usr/lib/apt/methods/https' ]; then
300-
echo "Install missing apt-transport-https..."
306+
echo "(*) Installing apt-transport-https..."
301307
apt-get -y install apt-transport-https >> $LOG
302308
check_result $? "Can't install apt-transport-https"
303309
fi
304310

305311
# Check if apt-add-repository is installed
306312
if [ ! -e '/usr/bin/apt-add-repository' ]; then
307-
echo "Install missing apt-add-repository..."
313+
echo "(*) Installing apt-add-repository..."
308314
apt-get -y install software-properties-common >> $LOG
309315
check_result $? "Can't install software-properties-common"
310316
fi
@@ -1112,7 +1118,7 @@ if [ "$nginx" = 'yes' ]; then
11121118
mkdir -p /etc/nginx/conf.d/domains
11131119
mkdir -p /var/log/nginx/domains
11141120
if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ]; then
1115-
echo "(*) Configuring Multi-PHP..."
1121+
echo "(*) Configuring Multi-PHP for NGINX..."
11161122
rm -fr $HESTIA/data/templates/web/nginx/*
11171123
for v in "${multiphp_v[@]}"; do
11181124
update-rc.d php$v-fpm defaults > /dev/null 2>&1
@@ -1179,7 +1185,7 @@ if [ "$apache" = 'yes' ]; then
11791185
chmod 640 /var/log/apache2/access.log /var/log/apache2/error.log
11801186
chmod 751 /var/log/apache2/domains
11811187
if [ "$multiphp" = 'yes' ] ; then
1182-
echo "Configure Apache MultiPHP"
1188+
echo "(*) Configuring Multi-PHP for Apache..."
11831189
a2enmod proxy_fcgi setenvif > /dev/null 2>&1
11841190
for v in "${multiphp_v[@]}"; do
11851191
a2enconf php$v-fpm-fpm > /dev/null 2>&1

0 commit comments

Comments
 (0)