happy-stacks 0.1.0 → 0.2.0

package/extras/swiftbar/set-interval.sh

@@ -26,13 +26,18 @@ if [[ -z "$PLUGIN_DIR" ]]; then
 fi
 mkdir -p "$PLUGIN_DIR"
 
-TARGET="$PLUGIN_DIR/happy-stacks.${INTERVAL}.sh"
-HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-$HOME/.happy-stacks}"
-HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-$HAPPY_STACKS_HOME_DIR}"
+PLUGIN_BASENAME="${HAPPY_STACKS_SWIFTBAR_PLUGIN_BASENAME:-${HAPPY_LOCAL_SWIFTBAR_PLUGIN_BASENAME:-happy-stacks}}"
+TARGET="$PLUGIN_DIR/${PLUGIN_BASENAME}.${INTERVAL}.sh"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DEFAULT_HOME_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+
+CANONICAL_HOME_DIR="${HAPPY_STACKS_CANONICAL_HOME_DIR:-${HAPPY_LOCAL_CANONICAL_HOME_DIR:-$DEFAULT_HOME_DIR}}"
+HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-${HAPPY_STACKS_HOME_DIR:-$CANONICAL_HOME_DIR}}"
+HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-$HAPPY_LOCAL_DIR}"
 SOURCE="${HAPPY_LOCAL_DIR}/extras/swiftbar/happy-stacks.5s.sh"
 
 # If a happy-stacks plugin already exists, rename it into place; otherwise copy from repo source.
-EXISTING="$(ls "$PLUGIN_DIR"/happy-stacks.*.sh 2>/dev/null | head -1 || true)"
+EXISTING="$(ls "$PLUGIN_DIR"/"${PLUGIN_BASENAME}".*.sh 2>/dev/null | head -1 || true)"
 if [[ -n "$EXISTING" ]]; then
   if [[ "$EXISTING" != "$TARGET" ]]; then
     rm -f "$TARGET"
@@ -47,7 +52,7 @@ else
 fi
 
 # Remove any other intervals to avoid duplicates in SwiftBar.
-for f in "$PLUGIN_DIR"/happy-stacks.*.sh; do
+for f in "$PLUGIN_DIR"/"${PLUGIN_BASENAME}".*.sh; do
   [[ "$f" == "$TARGET" ]] && continue
   rm -f "$f" || true
 done

package/extras/swiftbar/set-server-flavor.sh

@@ -24,34 +24,43 @@ if [[ "$FLAVOR" != "happy-server" && "$FLAVOR" != "happy-server-light" ]]; then
   exit 2
 fi
 
-HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-$HOME/.happy-stacks}"
-HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-$HAPPY_STACKS_HOME_DIR}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DEFAULT_HOME_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
-PNPM_BIN="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm.sh"
-if [[ ! -x "$PNPM_BIN" ]]; then
+HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-${HAPPY_STACKS_HOME_DIR:-$DEFAULT_HOME_DIR}}"
+HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-$HAPPY_LOCAL_DIR}"
+
+HAPPYS_BIN="$HAPPY_LOCAL_DIR/extras/swiftbar/happys.sh"
+if [[ ! -x "$HAPPYS_BIN" ]]; then
   echo "happys wrapper not found (run: happys menubar install)" >&2
   exit 1
 fi
 
 restart_main_service_best_effort() {
-  "$PNPM_BIN" service:restart >/dev/null 2>&1 || true
+  if [[ -n "${HAPPY_STACKS_SANDBOX_DIR:-}" ]]; then
+    return 0
+  fi
+  "$HAPPYS_BIN" service:restart >/dev/null 2>&1 || true
   # If the installed LaunchAgent is still legacy/baked, reinstall so it persists only env-file pointer.
-  "$PNPM_BIN" service:install >/dev/null 2>&1 || true
+  "$HAPPYS_BIN" service:install >/dev/null 2>&1 || true
 }
 
 restart_stack_service_best_effort() {
   local name="$1"
-  "$PNPM_BIN" stack service:restart "$name" >/dev/null 2>&1 || true
-  "$PNPM_BIN" stack service:install "$name" >/dev/null 2>&1 || true
+  if [[ -n "${HAPPY_STACKS_SANDBOX_DIR:-}" ]]; then
+    return 0
+  fi
+  "$HAPPYS_BIN" stack service:restart "$name" >/dev/null 2>&1 || true
+  "$HAPPYS_BIN" stack service:install "$name" >/dev/null 2>&1 || true
 }
 
 if [[ "$STACK" == "main" ]]; then
-  "$PNPM_BIN" srv -- use "$FLAVOR"
+  "$HAPPYS_BIN" srv -- use "$FLAVOR"
   restart_main_service_best_effort
   echo "ok: main -> $FLAVOR"
   exit 0
 fi
 
-"$PNPM_BIN" stack srv "$STACK" -- use "$FLAVOR"
+"$HAPPYS_BIN" stack srv "$STACK" -- use "$FLAVOR"
 restart_stack_service_best_effort "$STACK"
 echo "ok: $STACK -> $FLAVOR"

package/extras/swiftbar/wt-pr.sh

@@ -17,11 +17,18 @@ set -euo pipefail
 COMPONENT="${1:-}"
 STACK_NAME="${2:-}"
 
-HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-$HOME/.happy-stacks}"
-HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-$HAPPY_STACKS_HOME_DIR}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DEFAULT_HOME_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
-HAPPYS="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm.sh"
+HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-${HAPPY_STACKS_HOME_DIR:-$DEFAULT_HOME_DIR}}"
+HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-$HAPPY_LOCAL_DIR}"
+
+HAPPYS="$HAPPY_LOCAL_DIR/extras/swiftbar/happys.sh"
 if [[ ! -x "$HAPPYS" ]]; then
+  if [[ -n "${HAPPY_STACKS_SANDBOX_DIR:-}" ]]; then
+    echo "missing happys wrapper in sandbox: $HAPPYS" >&2
+    exit 1
+  fi
   HAPPYS="$(command -v happys 2>/dev/null || true)"
 fi
 if [[ -z "$HAPPYS" ]]; then

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "happy-stacks",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "packageManager": "pnpm@10.18.3",
   "bin": {
     "happys": "./bin/happys.mjs",
@@ -14,6 +14,7 @@
     "scripts/"
   ],
   "scripts": {
+    "setup": "node ./scripts/setup.mjs",
     "init": "node ./scripts/init.mjs",
     "uninstall": "node ./scripts/uninstall.mjs",
     "where": "node ./scripts/where.mjs",