From 060418f362c6cc687ed9418a3b6f937f33e89b46 Mon Sep 17 00:00:00 2001
From: mdheller <21163552+mdheller@users.noreply.github.com>
Date: Fri, 24 Apr 2026 22:22:20 -0400
Subject: [PATCH 1/2] build(source-os): stage sourceos-office in office shell
 installer

---
 build/office-suite/scripts/install_sourceos_office_shell.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/office-suite/scripts/install_sourceos_office_shell.sh b/build/office-suite/scripts/install_sourceos_office_shell.sh
index ac27f81..4937b2a 100644
--- a/build/office-suite/scripts/install_sourceos_office_shell.sh
+++ b/build/office-suite/scripts/install_sourceos_office_shell.sh
@@ -2,12 +2,18 @@
 set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
+BIN_DIR="$HOME/.local/bin"
 
 "$ROOT/build/office-suite/scripts/install_office_desktop_entry.sh"
 "$ROOT/build/office-suite/scripts/verify_office_desktop_entry.sh"
 
+mkdir -p "$BIN_DIR"
+cp "$ROOT/build/office-suite/scripts/sourceos-office" "$BIN_DIR/sourceos-office"
+chmod +x "$BIN_DIR/sourceos-office"
+
 if [[ -x "$ROOT/build/office-suite/scripts/verify_office_suite_profile.sh" ]]; then
   "$ROOT/build/office-suite/scripts/verify_office_suite_profile.sh"
 fi
 
+echo "installed sourceos-office to $BIN_DIR/sourceos-office"
 echo "SourceOS office shell install completed"

From 97b43f29bc0c7df63f2a8669a54b4b2bcdd5e79e Mon Sep 17 00:00:00 2001
From: mdheller <21163552+mdheller@users.noreply.github.com>
Date: Sat, 25 Apr 2026 07:56:28 -0400
Subject: [PATCH 2/2] build(source-os): verify installed sourceos-office
 command in shell smoke

---
 .../scripts/install_sourceos_office_shell_smoke.sh   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh b/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh
index 848f5d4..a956627 100644
--- a/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh
+++ b/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh
@@ -14,6 +14,7 @@ mkdir -p "$HOME"
 
 DESKTOP_FILE="$XDG_DATA_HOME/applications/sourceos-office.desktop"
 OPEN_BIN="$HOME/.local/bin/sourceos-office-open"
+SOURCEOS_OFFICE_BIN="$HOME/.local/bin/sourceos-office"
 CLOUD_BIN="$HOME/.local/bin/office_cloud_handoff.sh"
 MIME_FILE="$XDG_CONFIG_HOME/mimeapps.list"
 
@@ -27,6 +28,11 @@ MIME_FILE="$XDG_CONFIG_HOME/mimeapps.list"
   exit 1
 }
 
+[[ -x "$SOURCEOS_OFFICE_BIN" ]] || {
+  echo "office shell installer smoke failed: missing sourceos-office command" >&2
+  exit 1
+}
+
 [[ -x "$CLOUD_BIN" ]] || {
   echo "office shell installer smoke failed: missing cloud handoff helper" >&2
   exit 1
@@ -37,4 +43,10 @@ MIME_FILE="$XDG_CONFIG_HOME/mimeapps.list"
   exit 1
 }
 
+OUT="$($SOURCEOS_OFFICE_BIN help)"
+[[ "$OUT" == *"usage: sourceos-office"* ]] || {
+  echo "office shell installer smoke failed: sourceos-office help mismatch" >&2
+  exit 1
+}
+
 echo "office shell installer smoke passed"