David Heinemeier HanssonandClaude Fable 5
17c8af3f14
omarchy-restart-shell now kills by config dir via quickshell kill and relaunches with --no-duplicate, polling kill until every instance is gone since kill returns without waiting and -n silently exits if one remains. The locked-session refusal reads Hyprland monitor state alone, which covers a hung shell holding the lock; the redundant shell IPC probe, availability guards, and omarchy-shell path indirection are gone. Shell IPC calls now time out (2s default, OMARCHY_SHELL_IPC_TIMEOUT to override) so probing an unresponsive shell fails fast instead of hanging the caller. omarchy-hyprland-launch checks dispatch output for "ok" rather than the exit code, which is 0 even on Lua errors, so a failed dispatch falls through to the bash -lc fallback instead of silently launching nothing. The Quattro upgrade cutover delegates to omarchy-restart-shell instead of carrying its own copy of the lock check, pkill, and readiness loop. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
70 lines
2.1 KiB
Bash
Executable File
70 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Send an IPC call to the running Omarchy shell
|
|
# omarchy:args=[-q] <target> <method> [args...]
|
|
# omarchy:examples=omarchy shell shell ping | omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
|
|
|
|
QUIET=0
|
|
if [[ ${1:-} == "-q" ]]; then
|
|
QUIET=1
|
|
shift
|
|
fi
|
|
|
|
fail() {
|
|
(( QUIET )) && exit 0
|
|
echo "$1" >&2
|
|
exit 1
|
|
}
|
|
|
|
if (( $# == 0 )) || [[ $1 == "-h" || $1 == "--help" ]]; then
|
|
cat <<USAGE
|
|
Usage: omarchy-shell [-q] <target> <method> [args...]
|
|
|
|
Forwards an IPC call to the running Omarchy shell. The shell is expected
|
|
to already be running; this command does not start it.
|
|
|
|
Options:
|
|
-q Quiet best-effort mode. Suppress output and return success even when
|
|
the shell, target, method, or arguments are unavailable.
|
|
|
|
Examples:
|
|
omarchy-shell shell ping
|
|
omarchy-shell -q Indicators refresh
|
|
omarchy-shell shell listPlugins
|
|
omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
|
|
USAGE
|
|
exit 0
|
|
fi
|
|
|
|
(( $# >= 2 )) || fail "Usage: omarchy-shell <target> <method> [args...]"
|
|
[[ -n ${OMARCHY_PATH:-} ]] || fail "OMARCHY_PATH is not set"
|
|
[[ -f $OMARCHY_PATH/shell/shell.qml ]] || fail "omarchy-shell config not found: $OMARCHY_PATH/shell/shell.qml"
|
|
|
|
if [[ $1 == "shell" && ( $2 == "summon" || $2 == "toggle" ) ]] && (( $# == 3 )); then
|
|
set -- "$1" "$2" "$3" "{}"
|
|
fi
|
|
|
|
# The -- keeps function names that shadow qs subcommands (e.g. show) as
|
|
# positionals. qs reports connection failures with a nonzero exit, but IPC-level
|
|
# failures (unknown target/function, bad arguments) go to stdout with exit 0.
|
|
ipc_timeout=${OMARCHY_SHELL_IPC_TIMEOUT:-2s}
|
|
output=$(timeout --kill-after=1s "$ipc_timeout" qs -p "$OMARCHY_PATH/shell" ipc call -- "$@" 2>/dev/null)
|
|
ipc_status=$?
|
|
|
|
if (( ipc_status == 124 || ipc_status == 137 )); then
|
|
fail "omarchy-shell is not responding"
|
|
elif (( ipc_status != 0 )); then
|
|
fail "omarchy-shell is not running"
|
|
fi
|
|
|
|
case $output in
|
|
"Target not found." | "Function not found." | "Too few arguments provided"* | "Too many arguments provided"*)
|
|
fail "$output"
|
|
;;
|
|
esac
|
|
|
|
if (( !QUIET )) && [[ -n $output ]]; then
|
|
echo "$output"
|
|
fi
|
|
exit 0
|