feat: The Steamify shortcut opens the app

Steamify CachyOS on the desktop and in the launcher starts the newest app
(in Konsole the first time, while PySide6 still has to be installed); the
terminal menu is Steamify Terminal in the launcher. A shortcut from before
2.0.1 is ticked in the menu, so a normal run replaces it. steamify-app.sh
leaves the shortcut's launcher entry (same id) alone.

lib/menu.sh

@@ -24,7 +24,7 @@ declare -A LABEL=(
     [theme]="Install SteamOS theme: Vapor look (cachyos-vapor)"
     [glyphs]="Install Steam Deck/Machine icons: Deck button icons in gaming mode"
     [single]="Single user mode: no password, lock screen or log out (SDDM)"
-    [launcher]="Steamify shortcut: desktop icon to run this again"
+    [launcher]="Steamify shortcut: the app on the desktop, Steamify Terminal in the launcher"
     [cec]="HDMI-CEC: use Steam with the TV remote, TV on/off with the PC (experimental)"
     [machine]="Steam Machine support: LED bar driver, hardware settings in Steam"
     [kpin]="Pin the kernel to $PINNED_KERNEL_VER (fixes rebooting after shutdown)"
@@ -72,6 +72,9 @@ detect_components() {
     done
     # HDMI-CEC set up by an older version: tick it, so a normal run fixes it.
     component_available cec && cec_repair && WANTED[cec]=1
+    # The terminal-only Steamify shortcut from before 2.0.1: tick it, so a
+    # normal run replaces it with the app.
+    launcher_repair && WANTED[launcher]=1
     # Shows the current and newest BIOS version.
     bios_available && { bios_lookup_newest; LABEL[bios]="$(bios_label)"; }
     # First run: preselect the full SteamOS experience (never an action).

lib/wizard-shortcut.sh

@@ -1,19 +1,29 @@
 #!/bin/bash
-# "Steamify shortcut" menu item: a desktop icon and an app launcher entry that
-# open the newest release of Steamify CachyOS in Konsole (curl | bash, like the
-# install command in the README), so it's never out of date.
+# "Steamify shortcut" menu item: "Steamify CachyOS" on the desktop and in the
+# app launcher opens the newest release of the app (curl | bash of
+# steamify-app.sh, like the install command in the README), so it's never out
+# of date; "Steamify Terminal" in the launcher opens the terminal menu in
+# Konsole the same way.
 # Sourced by steamify.sh; not meant to be run on its own.
 
 WIZARD_RELEASE="https://github.com/theupriser/steamify-cachyos/releases/latest/download"
 WIZARD_URL="$WIZARD_RELEASE/steamify.sh"
+WIZARD_APP_URL="$WIZARD_RELEASE/steamify-app.sh"
 # Steam logo with a gear (assets/ in the repo, published with every release).
 WIZARD_ICON="${XDG_DATA_HOME:-$HOME/.local/share}/icons/hicolor/scalable/apps/cachyos-gamescope-boot-wizard.svg"
 WIZARD_LAUNCHER="${XDG_DATA_HOME:-$HOME/.local/share}/cachyos-gamescope-boot/run-wizard"
-WIZARD_DESKTOP_NAME="cachyos-gamescope-boot-wizard.desktop"
-WIZARD_APP_ENTRY="${XDG_DATA_HOME:-$HOME/.local/share}/applications/$WIZARD_DESKTOP_NAME"
+WIZARD_APP_LAUNCHER="${XDG_DATA_HOME:-$HOME/.local/share}/cachyos-gamescope-boot/run-app"
+WIZARD_APPS="${XDG_DATA_HOME:-$HOME/.local/share}/applications"
+# steamify-ui: the id the app gives itself, so its window belongs to this
+# entry. steamify-app.sh leaves an entry with X-Steamify-Shortcut alone.
+WIZARD_DESKTOP_NAME="steamify-ui.desktop"
+WIZARD_APP_ENTRY="$WIZARD_APPS/$WIZARD_DESKTOP_NAME"
+WIZARD_TERMINAL_ENTRY="$WIZARD_APPS/steamify-terminal.desktop"
+# Before 2.0.1 the shortcut opened the terminal menu under this name.
+WIZARD_OLD_NAME="cachyos-gamescope-boot-wizard.desktop"
 
-wizard_desktop_file() {
-    echo "$(xdg-user-dir DESKTOP 2>/dev/null || echo "$HOME/Desktop")/$WIZARD_DESKTOP_NAME"
+wizard_desktop_dir() {
+    xdg-user-dir DESKTOP 2>/dev/null || echo "$HOME/Desktop"
 }
 
 install_executable() {
@@ -29,11 +39,15 @@ install_executable() {
 }
 
 launcher_status() {
-    [[ -x "$WIZARD_LAUNCHER" && -f "$WIZARD_APP_ENTRY" ]]
+    [[ -x "$WIZARD_APP_LAUNCHER" && -x "$WIZARD_LAUNCHER" && -f "$WIZARD_APP_ENTRY" && -f "$WIZARD_TERMINAL_ENTRY" ]]
 }
 
+# A shortcut from before 2.0.1 (terminal only): the menu ticks the item, so a
+# normal run replaces it.
+launcher_repair() { [[ -f "$WIZARD_APPS/$WIZARD_OLD_NAME" ]] && ! launcher_status; }
+
 launcher_enable() {
-    info "Adding the Steamify shortcut (desktop icon and app launcher entry)..."
+    info "Adding the Steamify shortcut (the app on the desktop and in the launcher, Steamify Terminal in the launcher)..."
     install_executable "$WIZARD_LAUNCHER" 755 << EOF
 #!/bin/bash
 # Installed by Steamify CachyOS: run its newest release.
@@ -53,6 +67,23 @@ for (( i = 10; i > 0; i-- )); do
     read -rs -t 1 _ && break
 done
 echo
+EOF
+
+    # The app, without a terminal. Only the first time, when PySide6 still
+    # has to be installed, it runs in Konsole: sudo asks for the password there.
+    install_executable "$WIZARD_APP_LAUNCHER" 755 << EOF
+#!/bin/bash
+# Installed by Steamify CachyOS: start the newest release of its app.
+set -o pipefail
+if [[ "\${1:-}" != --in-terminal ]] && ! python3 -c 'import PySide6.QtQml' 2>/dev/null; then
+    exec konsole -e "\$0" --in-terminal
+fi
+if ! curl -fsSL --max-time 30 "$WIZARD_APP_URL" | bash; then
+    msg="Couldn't download or start Steamify. Are you connected to the internet?"
+    if [[ "\${1:-}" == --in-terminal ]]; then echo; echo "\$msg"; read -rp "Press Enter to close this window... " _
+    else kdialog --title Steamify --sorry "\$msg" 2>/dev/null; fi
+    exit 1
+fi
 EOF
 
     # The icon comes with the release; without it, Steam's own icon.
@@ -72,18 +103,34 @@ EOF
 Type=Application
 Name=Steamify CachyOS
 Comment=Turn the SteamOS-style parts of this PC on or off
+Exec=$WIZARD_APP_LAUNCHER
+Icon=$icon
+Terminal=false
+Categories=Game;System;Settings;
+X-Steamify-Shortcut=true"
+    printf '%s\n' "$entry" | install_executable "$WIZARD_APP_ENTRY" 644
+    printf '%s\n' "$entry" | install_executable "$(wizard_desktop_dir)/$WIZARD_DESKTOP_NAME" 755
+    printf '%s\n' "[Desktop Entry]
+Type=Application
+Name=Steamify Terminal
+Comment=Steamify CachyOS's menu in a terminal
 Exec=konsole -e $WIZARD_LAUNCHER
 Icon=$icon
 Terminal=false
-Categories=Game;System;Settings;"
-    printf '%s\n' "$entry" | install_executable "$WIZARD_APP_ENTRY" 644
-    printf '%s\n' "$entry" | install_executable "$(wizard_desktop_file)" 755
+Categories=Game;System;Settings;" | install_executable "$WIZARD_TERMINAL_ENTRY" 644
+    # The terminal-only shortcut from before 2.0.1.
+    rm -f "$(wizard_desktop_dir)/$WIZARD_OLD_NAME" "$WIZARD_APPS/$WIZARD_OLD_NAME"
     kbuildsycoca6 >/dev/null 2>&1 || true
-    ok "Steamify shortcut added: \"Steamify CachyOS\" on the desktop and in the launcher."
+    ok "Steamify shortcut added: \"Steamify CachyOS\" (the app) on the desktop and in the launcher, \"Steamify Terminal\" in the launcher."
 }
 
 launcher_disable() {
-    rm -f "$(wizard_desktop_file)" "$WIZARD_APP_ENTRY" "$WIZARD_LAUNCHER" "$WIZARD_ICON"
+    # The launcher entry only if it's ours: steamify-app.sh writes its own
+    # under the same name when there's no shortcut.
+    grep -q '^X-Steamify-Shortcut=true' "$WIZARD_APP_ENTRY" 2>/dev/null && rm -f "$WIZARD_APP_ENTRY"
+    rm -f "$(wizard_desktop_dir)/$WIZARD_DESKTOP_NAME" "$WIZARD_TERMINAL_ENTRY" \
+        "$(wizard_desktop_dir)/$WIZARD_OLD_NAME" "$WIZARD_APPS/$WIZARD_OLD_NAME" \
+        "$WIZARD_LAUNCHER" "$WIZARD_APP_LAUNCHER" "$WIZARD_ICON"
     rmdir "$(dirname "$WIZARD_LAUNCHER")" 2>/dev/null || true
     kbuildsycoca6 >/dev/null 2>&1 || true
     ok "Steamify shortcut removed."