Skip to content

Commit 0a7164e

Browse files
author
Kristan Kenney
committed
Update messages displayed during upgrades
1 parent a62bc60 commit 0a7164e

File tree

2 files changed

+40
-31
lines changed

2 files changed

+40
-31
lines changed

‎func/upgrade.sh‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,26 @@
88

99
upgrade_welcome_message() {
1010
echo
11-
echo ' _ _ _ _ ____ ____ '
12-
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
13-
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) | '
14-
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
15-
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
16-
echo " "
17-
echo " Hestia Control Panel Software Update "
18-
echo " Version: $new_version "
19-
echo "======================================================================"
11+
echo ' _ _ _ _ ____ ____ '
12+
echo ' | | | | ___ ___| |_(_) __ _ / ___| _ \ '
13+
echo ' | |_| |/ _ \/ __| __| |/ _` | | | |_) | '
14+
echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
15+
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
16+
echo " "
17+
echo " Hestia Control Panel Software Update "
18+
echo " Version: $new_version "
19+
echo "========================================================================"
2020
echo
21-
echo "Please note that some configuration and template files may be modified"
22-
echo "files may be replaced during the upgrade process."
21+
echo "(!) IMPORTANT INFORMATION: "
22+
echo
23+
echo "Default configuration files and templates may be modified or replaced "
24+
echo "during the upgrade process. You may restore these files from: "
2325
echo ""
24-
echo "Backups of these files will be available under:"
25-
echo "$HESTIA_BACKUP/"
26+
echo "Backup directory: $HESTIA_BACKUP/ "
2627
echo
27-
echo "This process may take a few minutes, please wait..."
28+
echo "This process may take a few minutes, please wait... "
2829
echo
29-
echo "======================================================================"
30+
echo "========================================================================"
3031
echo
3132
}
3233

@@ -36,19 +37,24 @@ upgrade_complete_message() {
3637

3738
# Echo message to console output
3839
echo
39-
echo "======================================================================"
40-
echo ""
41-
echo " Upgrade complete! Please report any bugs or issues to"
42-
echo " https://github.com/hestiacp/hestiacp/issues"
40+
echo "========================================================================"
41+
echo
42+
echo "Upgrade complete! If you encounter any issues or find a bug, "
43+
echo "please take a moment to report it to us on GitHub at the URL below: "
44+
echo "https://github.com/hestiacp/hestiacp/issues "
4345
echo
44-
echo " We hope that you enjoy this release of Hestia Control Panel,"
45-
echo " enjoy your day!"
46+
echo "We hope that you enjoy using this version of Hestia Control Panel, "
47+
echo "have a wonderful day! "
4648
echo
47-
echo " Sincerely,"
48-
echo " The Hestia Control Panel development team"
49+
echo "Sincerely, "
50+
echo "The Hestia Control Panel development team "
4951
echo
50-
echo " www.hestiacp.com"
51-
echo " Made with love & pride by the open-source community around the world."
52+
echo "Web: https://www.hestiacp.com/ "
53+
echo "Forum: https://forum.hestiacp.com/ "
54+
echo "GitHub: https://github.com/hestiacp/hestiacp/ "
55+
echo "E-mail: info@hestiacp.com "
56+
echo
57+
echo "Made with love & pride by the open-source community around the world. "
5258
echo
5359
echo
5460
}
@@ -73,9 +79,11 @@ upgrade_start_routine() {
7379

7480
#####################################################################
7581
####### Start upgrade for pre-release builds #######
82+
####### Ensures clean upgrade path from v1.0.1 onwards #######
83+
####### DO NOT MODIFY THIS SECTION #######
7684
#####################################################################
7785

78-
if [ $VERSION = "0.9.8-25" ] || [ $VERSION = "0.9.8-26" ] || [ $VERSION = "0.9.8-27" ] || [ $VERSION = "0.9.8-28" ] || [ $VERSION = "0.9.8-29" ] || [ $VERSION = "0.10.0" ] || [ $VERSION = "1.00.0-190618" ] || [ $VERSION = "1.00.0-190621" ]; then
86+
if [ $VERSION = "0.9.8-25" ] || [ $VERSION = "0.9.8-26" ] || [ $VERSION = "0.9.8-27" ] || [ $VERSION = "0.9.8-28" ] || [ $VERSION = "0.9.8-29" ] || [ $VERSION = "0.10.0" ] || [ $VERSION = "1.00.0-190618" ] || [ $VERSION = "1.00.0-190621" ] || [ $VERSION = "1.0.0" ]; then
7987
source $HESTIA/install/upgrade/versions/previous/0.9.8-29.sh
8088
source $HESTIA/install/upgrade/versions/previous/1.00.0-190618.sh
8189
source $HESTIA/install/upgrade/versions/previous/1.0.1.sh
@@ -84,11 +92,12 @@ upgrade_start_routine() {
8492

8593
#####################################################################
8694
####### Start standard upgrade process #######
95+
####### Place instructions for all post v1.0.1 builds below #######
8796
#####################################################################
8897

8998
# Ensure that latest upgrade commands are processed if version is the same
9099
if [ $VERSION = "$new_version" ]; then
91-
echo "(!) The latest version of Hestia Control Panel ($new_version) is already installed."
100+
echo "(!) The latest version of Hestia Control Panel is already installed."
92101
echo " Verifying configuration..."
93102
echo ""
94103
source $HESTIA/install/upgrade/versions/latest.sh
@@ -108,7 +117,7 @@ upgrade_start_routine() {
108117
fi
109118

110119
#####################################################################
111-
####### End upgrade process #######
120+
####### End version-specific upgrade instruction sets #######
112121
#####################################################################
113122
}
114123

@@ -120,10 +129,10 @@ upgrade_phpmyadmin() {
120129

121130
pma_release_file=$(ls /usr/share/phpmyadmin/RELEASE-DATE-* 2>/dev/null |tail -n 1)
122131
if version_ge "${pma_release_file##*-}" "$pma_v"; then
123-
echo "(*) phpMyAdmin $pma_v or newer is already installed: ${pma_release_file##*-}, skipping update..."
132+
echo "(!) phpMyAdmin v${pma_release_file##*-} is already installed, skipping update..."
124133
else
125134
# Display upgrade information
126-
echo "(*) Upgrade phpMyAdmin to v$pma_v..."
135+
echo "(*) Upgrading phpMyAdmin to version v$pma_v..."
127136
[ -d /usr/share/phpmyadmin ] || mkdir -p /usr/share/phpmyadmin
128137

129138
# Download latest phpMyAdmin release

‎install/upgrade/versions/latest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ -z $THEME ]; then
1313
fi
1414

1515
# Replace dhparam 1024 with dhparam 4096
16-
echo "(*) Installing 4096-bit SSL security certificate..."
16+
echo "(*) Increasing Diffie-Hellman Parameter strength to 4096-bit..."
1717
mv /etc/ssl/dhparam.pem $HESTIA_BACKUP/conf/
1818
cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl/
1919
chmod 600 /etc/ssl/dhparam.pem

0 commit comments

Comments
 (0)