Skip to content

Commit 996380d

Browse files
authored
Cosmetics on warnings on menu 02 upgrade (#2054)
Signed-off-by: Markus Storm <[email protected]>
1 parent d99adea commit 996380d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

functions/menu.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ show_main_menu() {
3838
"" "" \
3939
"01 | Select Branch" "Select the openHABian config tool version (\"branch\") to run" \
4040
"02 | Upgrade System" "Update all OS software packages (but not openHAB) to latest versions" \
41-
"03 | Install openHAB" "Install or upgrade to latest openHAB" \
41+
"03 | Install openHAB" "Install or upgrade to latest openHAB (including Java)" \
4242
"04 | Import config" "Import an openHAB configuration from file or URL" \
4343
"" "" \
4444
"10 | Apply Improvements" "Apply the latest improvements to the basic openHABian setup ►" \

functions/system.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ whiptail_check() {
1818
## system_upgrade()
1919
##
2020
system_upgrade() {
21-
local upgradeText="ATTENTION !\\n\\nYou chose upgrade ALL of your software packages in one go.\\nNote this will include upgrading openHAB itself to its latest version which might be a major upgrade and can break your working system.\\n\\n Are you sure this is what you want?\\n"
22-
local OH4upgradeText="ATTENTION !\\n\\nYou chose to upgrade ALL of your software packages\\nThis is not possible when you are not on the current major version of openHAB, OH4, or the version under development, OH5.\\n\\nIn order to upgrade to openHAB 4 first, use the next menu option."
21+
local upgradeText="ATTENTION !\\n\\nYou chose upgrade ALL of your operating system software packages in one go.\\nNote this will be a major upgrade and can break your working system.\\n\\n Are you sure this is what you want?\\n"
22+
local OH4upgradeText="ATTENTION !\\n\\nYou chose to upgrade ALL of your software packages\\nThis is not possible when you are not on one of the current major version of openHAB, OH4 or OH5.\\n\\nIn order to upgrade to openHAB 4 first, use the next menu option 03."
2323

2424
echo "$(timestamp) [openHABian] Updating repositories and upgrading installed packages..."
2525
if [[ -n "$INTERACTIVE" ]]; then

0 commit comments

Comments
 (0)