Skip to content

Commit 20b0fd9

Browse files
jaapmarcuswojsmol
andauthored
Allow interactive to skip reboot (hestiacp#1843)
* Allow interactive to skip reboot * Update install/hst-install-debian.sh Co-authored-by: Wojciech Smoliński <wojsmol@wp.pl> * Update install/hst-install-ubuntu.sh Co-authored-by: Wojciech Smoliński <wojsmol@wp.pl> Co-authored-by: Wojciech Smoliński <wojsmol@wp.pl>
1 parent 4a19b64 commit 20b0fd9

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

install/hst-install-debian.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,16 +1934,17 @@ rm -f $tmpfile
19341934
# Add welcome message to notification panel
19351935
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
19361936

1937-
echo "[ ! ] IMPORTANT: System will reboot"
1938-
echo ""
1939-
if [ "$interactive" = 'yes' ]; then
1940-
echo -n " Press any key to continue!"
1941-
read reboot
1942-
fi
1943-
19441937
# Clean-up
19451938
# Sort final configuration file
19461939
sort_config_file
19471940

1948-
reboot
1941+
if [ "$interactive" = 'yes' ]; then
1942+
echo "[ ! ] IMPORTANT: System will reboot"
1943+
echo ""
1944+
echo -n " Press any key to continue!"
1945+
read reboot
1946+
reboot
1947+
else
1948+
echo "[ ! ] IMPORTANT: You must logout or restart the server before continuing"
1949+
fi
19491950
# EOF

install/hst-install-ubuntu.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,16 +1966,17 @@ rm -f $tmpfile
19661966
# Add welcome message to notification panel
19671967
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
19681968

1969-
echo "[ ! ] IMPORTANT: System will reboot"
1970-
echo ""
1971-
if [ "$interactive" = 'yes' ]; then
1972-
echo -n " Press any key to continue!"
1973-
read reboot
1974-
fi
1975-
19761969
# Clean-up
19771970
# Sort final configuration file
19781971
sort_config_file
19791972

1980-
reboot
1973+
if [ "$interactive" = 'yes' ]; then
1974+
echo "[ ! ] IMPORTANT: System will reboot"
1975+
echo ""
1976+
echo -n " Press any key to continue!"
1977+
read reboot
1978+
reboot
1979+
else
1980+
echo "[ ! ] IMPORTANT: You must logout or restart the server before continuing"
1981+
fi
19811982
# EOF

0 commit comments

Comments
 (0)