From c862da789f4c3adef053e2f72941e3fe5cc3847d Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Thu, 24 Sep 2026 13:30:56 +0200 Subject: [PATCH] fix: Messages say which way it boots "boot into: gamescope (from the next boot)" instead of "turn off: Boot into the desktop instead of gaming mode"; also in the progress line and the Done overview. --- CHANGELOG.md | 6 +++++- lib/menu.sh | 12 ++++++++++-- steamify.sh | 12 +++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aa96d1..b5b7054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,13 @@ one per merged pull request. - The later menu items move down one (BIOS is now 8 on a Steam Machine). - `4895de3` **feat: "Boot into" is a sub-option of the conversion** - Shown indented under the SteamOS conversion, and only while it's ticked. -- **feat: Left/Right arrows choose on the "Boot into" row** +- `bd90e29` **feat: Left/Right arrows choose on the "Boot into" row** - Left = gamescope, right = desktop (Space still switches); the row says "←/→ choose" and the key help lists Left/Right. +- **fix: Messages say which way it boots** + - "This will: boot into: gamescope (from the next boot)" instead of "turn + off: Boot into the desktop instead of gaming mode", and the same in the + progress line and the "Done" overview. ## 0.9.1 - 2026-09-24 (#10) diff --git a/lib/menu.sh b/lib/menu.sh index 4f8e643..c859488 100644 --- a/lib/menu.sh +++ b/lib/menu.sh @@ -34,6 +34,12 @@ component_available() { is_action() { [[ " ${ACTIONS[*]} " == *" $1 "* ]]; } +boot_mode() { + # boot_mode 0|1: the "Boot into" choice as a word, for messages; "turn + # off boot into the desktop" reads as the opposite of what was chosen. + if [[ "$1" == 1 ]]; then echo desktop; else echo gamescope; fi +} + menu_visible() { # Shown in the menu. "Boot into" is a sub-option of the conversion: only # while the conversion is ticked. @@ -243,11 +249,13 @@ apply_changes() { [[ "${WANTED[single]}" == 1 ]] && LOGIN_MANAGER=sddm for c in "${TO_DISABLE[@]}"; do - echo; echo -e "${c_bold}Turning off: ${LABEL[$c]}${c_reset}" + if [[ "$c" == boot ]]; then echo; echo -e "${c_bold}Boot into: gamescope${c_reset}" + else echo; echo -e "${c_bold}Turning off: ${LABEL[$c]}${c_reset}"; fi "${c}_disable" || failed+=("$c") done for c in "${TO_ENABLE[@]}"; do - if is_action "$c"; then echo; echo -e "${c_bold}Running: ${LABEL[$c]%%:*}${c_reset}" + if [[ "$c" == boot ]]; then echo; echo -e "${c_bold}Boot into: desktop${c_reset}" + elif is_action "$c"; then echo; echo -e "${c_bold}Running: ${LABEL[$c]%%:*}${c_reset}" else echo; echo -e "${c_bold}Turning on: ${LABEL[$c]}${c_reset}"; fi "${c}_enable" || failed+=("$c") done diff --git a/steamify.sh b/steamify.sh index 3363ea0..313bb2b 100755 --- a/steamify.sh +++ b/steamify.sh @@ -118,9 +118,13 @@ while true; do echo echo -e "${c_bold}This will:${c_reset}" - for c in "${TO_DISABLE[@]}"; do echo " - turn off: ${LABEL[$c]}"; done + for c in "${TO_DISABLE[@]}"; do + if [[ "$c" == boot ]]; then echo " - boot into: gamescope (from the next boot)" + else echo " - turn off: ${LABEL[$c]}"; fi + done for c in "${TO_ENABLE[@]}"; do - if is_action "$c"; then echo " - run: ${LABEL[$c]%%:*} at your own risk (checks, then asks twice more)" + if [[ "$c" == boot ]]; then echo " - boot into: desktop (from the next boot)" + elif is_action "$c"; then echo " - run: ${LABEL[$c]%%:*} at your own risk (checks, then asks twice more)" elif [[ "${CURRENT[$c]}" == 1 ]]; then echo " - re-apply: ${LABEL[$c]}"; else echo " - turn on: ${LABEL[$c]}"; fi done ask_yn "Go ahead?" y || { info "Nothing changed."; continue; } @@ -143,7 +147,9 @@ while true; do echo -e "${c_bold}Done. Current state:${c_reset}" for c in "${COMPONENTS[@]}"; do component_available "$c" && ! is_action "$c" || continue - if [[ "${CURRENT[$c]}" == 1 ]]; then echo -e " ${c_green}on ${c_reset} ${LABEL[$c]}"; else echo " off ${LABEL[$c]}"; fi + if [[ "$c" == boot ]]; then + [[ "${CURRENT[gaming]}" == 1 ]] && echo " └ boots into: $(boot_mode "${CURRENT[boot]}")" + elif [[ "${CURRENT[$c]}" == 1 ]]; then echo -e " ${c_green}on ${c_reset} ${LABEL[$c]}"; else echo " off ${LABEL[$c]}"; fi done if [[ ${#FAILED[@]} -gt 0 ]]; then warn "These had problems (see above): ${FAILED[*]}"