mirror of
https://github.com/TencentCloud/Octop.git
synced 2026-09-29 03:43:01 +08:00
jubaoliang
f6bcfd94c7
* fix(desktop): restore only the main window on macOS dock click Wails shows every hidden window on ApplicationShouldHandleReopen, which also popped the tray settings overlay. Cancel that default and restore the main window only. * fix(desktop): polish splash, tray settings, and health-wait copy Show window controls on the splash and settings shell, open the macOS menu-bar popover on left click, and replace /api/health English errors with locale-aware status text. * fix(desktop): show only close on the settings popover Minimise and maximise do not apply to the tray settings window. Close hides that overlay instead of sending the main window to the tray. ---------
75 lines
2.0 KiB
Bash
75 lines
2.0 KiB
Bash
#!/bin/bash
|
|
# Desktop shell against a source Octop (hot reload). Not ~/.octop/portable.
|
|
# Starts Octop in this shell and stops it when wails3 / this script exits.
|
|
set -euo pipefail
|
|
|
|
REPO="$(cd "$(dirname "$0")/.." && pwd)"
|
|
PORT="${OCTOP_PORT:-8088}"
|
|
URL="${OCTOP_DESKTOP_URL:-http://127.0.0.1:${PORT}}"
|
|
HEALTH="${URL%/}/api/health"
|
|
WAILS3_PKG="github.com/wailsapp/wails/v3/cmd/wails3@latest"
|
|
|
|
missing=0
|
|
if ! command -v go >/dev/null 2>&1; then
|
|
missing=1
|
|
echo "go is not installed (need Go 1.25+)." >&2
|
|
echo " macOS: brew install go" >&2
|
|
echo " Linux: https://go.dev/dl/" >&2
|
|
echo " then: export PATH=\"\$(go env GOPATH)/bin:\$PATH\"" >&2
|
|
fi
|
|
if ! command -v wails3 >/dev/null 2>&1; then
|
|
missing=1
|
|
echo "wails3 is not installed." >&2
|
|
echo " go install ${WAILS3_PKG}" >&2
|
|
echo " export PATH=\"\$(go env GOPATH)/bin:\$PATH\"" >&2
|
|
fi
|
|
if [[ "$missing" -eq 1 ]]; then
|
|
exit 1
|
|
fi
|
|
|
|
octop_pid=""
|
|
cleaned=0
|
|
|
|
cleanup() {
|
|
[[ "$cleaned" -eq 1 ]] && return
|
|
cleaned=1
|
|
trap - EXIT INT TERM
|
|
if [[ -n "$octop_pid" ]] && kill -0 "$octop_pid" 2>/dev/null; then
|
|
kill -TERM "$octop_pid" 2>/dev/null || true
|
|
wait "$octop_pid" 2>/dev/null || true
|
|
fi
|
|
}
|
|
trap cleanup EXIT INT TERM
|
|
|
|
if curl -sf -o /dev/null --max-time 1 "$HEALTH"; then
|
|
echo "Octop already listening at ${URL}; stop it first so this script can own the process." >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "starting octop --reload on port ${PORT}"
|
|
(
|
|
cd "$REPO"
|
|
exec env OCTOP_DESKTOP=1 uv run octop run --reload --host 127.0.0.1 --port "$PORT"
|
|
) &
|
|
octop_pid=$!
|
|
|
|
for _ in $(seq 1 60); do
|
|
if curl -sf -o /dev/null --max-time 1 "$HEALTH"; then
|
|
break
|
|
fi
|
|
if ! kill -0 "$octop_pid" 2>/dev/null; then
|
|
echo "Octop 进程在就绪前退出了，请查看上方日志。" >&2
|
|
exit 1
|
|
fi
|
|
sleep 0.5
|
|
done
|
|
|
|
if ! curl -sf -o /dev/null --max-time 1 "$HEALTH"; then
|
|
echo "Octop 未在 30 秒内就绪（${URL}）。" >&2
|
|
echo "请查看上方 octop run 的输出；常见原因：端口被占用、依赖缺失，或服务启动失败。" >&2
|
|
exit 1
|
|
fi
|
|
|
|
cd "$REPO/desktop/src"
|
|
OCTOP_DESKTOP_URL="$URL" wails3 dev
|