Skip to content

Commit ac9d81c

Browse files
committed
Small fixes due to mail notification changes.
1 parent 4a09fc3 commit ac9d81c

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

install/hst-install-debian.sh

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,25 +1477,21 @@ if [ "$host_ip" = "$ip" ]; then
14771477
fi
14781478

14791479
# Sending notification to admin email
1480-
content=$(cat <<-END
1481-
Congratulations, you have just successfully installed Hestia Control Panel!
1482-
1480+
echo -e "Congratulations, you have just successfully installed \
1481+
Hestia Control Panel
14831482
https://$ip:$port
14841483
username: admin
14851484
password: $vpass
1486-
1487-
We hope that you enjoy your installation of Hestia. Please
1485+
We hope that you enjoy your installation of Hestia. Please \
14881486
feel free to contact us anytime if you have any questions.
14891487
Thank you.
1490-
14911488
--
14921489
Sincerely yours
14931490
hestiacp.com team
1494-
END
1495-
)
1491+
" > $tmpfile
14961492

14971493
send_mail="$HESTIA/web/inc/mail-wrapper.php"
1498-
echo $content | php $send_mail -s "Hestia Control Panel" $email
1494+
cat $tmpfile | php $send_mail -s "Hestia Control Panel" $email
14991495

15001496
# Congrats
15011497
echo '======================================================='
@@ -1507,6 +1503,7 @@ echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
15071503
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
15081504
echo
15091505
echo
1510-
echo $content
1506+
cat $tmpfile
1507+
rm -f $tmpfile
15111508

15121509
# EOF

install/hst-install-ubuntu.sh

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,25 +1425,21 @@ if [ "$host_ip" = "$ip" ]; then
14251425
fi
14261426

14271427
# Sending notification to admin email
1428-
content=$(cat <<-END
1429-
Congratulations, you have just successfully installed Hestia Control Panel!
1430-
1428+
echo -e "Congratulations, you have just successfully installed \
1429+
Hestia Control Panel
14311430
https://$ip:$port
14321431
username: admin
14331432
password: $vpass
1434-
1435-
We hope that you enjoy your installation of Hestia. Please
1433+
We hope that you enjoy your installation of Hestia. Please \
14361434
feel free to contact us anytime if you have any questions.
14371435
Thank you.
1438-
14391436
--
14401437
Sincerely yours
14411438
hestiacp.com team
1442-
END
1443-
)
1439+
" > $tmpfile
14441440

14451441
send_mail="$HESTIA/web/inc/mail-wrapper.php"
1446-
echo $content | php $send_mail -s "Hestia Control Panel" $email
1442+
cat $tmpfile | php $send_mail -s "Hestia Control Panel" $email
14471443

14481444
# Congrats
14491445
echo '======================================================='
@@ -1455,6 +1451,7 @@ echo ' | _ | __/\__ \ |_| | (_| | |___| __/ '
14551451
echo ' |_| |_|\___||___/\__|_|\__,_|\____|_| '
14561452
echo
14571453
echo
1458-
echo $content
1454+
cat $tmpfile
1455+
rm -f $tmpfile
14591456

14601457
# EOF

0 commit comments

Comments
 (0)