From 1fe83ff129e6588887e2bf62ea07abf25036dc5b Mon Sep 17 00:00:00 2001
From: Spencer Bull <spencer@omarchy.org>
Date: Mon, 7 Sep 2026 01:15:08 -0500
Subject: [PATCH] Merge pull request #10460 from
 codemonkey76/fix-openclaw-cmd-present

Use the command helper in the AI app removers

(cherry picked from commit 18410a0e480c239508efcee252684db430215e94)
(cherry picked from commit 67125c330b36204356a92867b9c9120a4599afae)
---
 bin/omarchy-remove-ai-hermes   | 2 +-
 bin/omarchy-remove-ai-openclaw | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/omarchy-remove-ai-hermes b/bin/omarchy-remove-ai-hermes
index f6b9f292..388746b7 100755
--- a/bin/omarchy-remove-ai-hermes
+++ b/bin/omarchy-remove-ai-hermes
@@ -73,7 +73,7 @@ fi
 # never owned, a yes takes that with it, and saying so is the prompt's job.
 # Without a terminal to ask in, keeping everything is the answer.
 data_removed=false
-if [[ -d $HOME/.hermes || -d $HOME/.config/Hermes ]] && [[ -t 0 ]] && command -v gum >/dev/null; then
+if [[ -d $HOME/.hermes || -d $HOME/.config/Hermes ]] && [[ -t 0 ]] && omarchy-cmd-present gum; then
   # du answers non-zero when either directory is missing, and pipefail would
   # turn that into an aborted removal; the size is worth no such thing.
   size=$(du -shc "$HOME/.hermes" "$HOME/.config/Hermes" 2>/dev/null | tail -1 | cut -f1 || true)
diff --git a/bin/omarchy-remove-ai-openclaw b/bin/omarchy-remove-ai-openclaw
index 47658a20..e610cbbe 100755
--- a/bin/omarchy-remove-ai-openclaw
+++ b/bin/omarchy-remove-ai-openclaw
@@ -61,7 +61,7 @@ gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
 # front of the user with the size rather than left silent. Without a terminal
 # to ask in, keeping it is the answer.
 state_removed=false
-if [[ -d $HOME/.openclaw && -t 0 ]] && command -v gum >/dev/null; then
+if [[ -d $HOME/.openclaw && -t 0 ]] && omarchy-cmd-present gum; then
   size=$(du -sh "$HOME/.openclaw" 2>/dev/null | cut -f1)
   if gum confirm --default=false "Also delete ~/.openclaw ($size: chats, memories, credentials, and downloaded plugins)?"; then
     rm -rf "$HOME/.openclaw"