apaam/mytoolkit
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install: refuse runner worktrees and bind the CLI Python.

Browse Source 
Keep editable installs on the canonical checkout so PATH mytoolkit cannot silently pick up a stale GHA _work tree.
This commit is contained in:
Zhengshou Lai
2026-08-11 21:16:05 +08:00
parent 70821e4661
commit 089da97633
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+25 -2
View File
@@ -1,21 +1,44 @@
ROOT_DIR := $(shell pwd)
PYTHON ?= python3
# Prefer an explicit PYTHON=; else the interpreter behind `mytoolkit` on PATH;
# else python3. Never silently install into a different Python than the CLI.
CLI_BIN := $(shell command -v mytoolkit 2>/dev/null)
CLI_PY := $(if $(CLI_BIN),$(shell head -1 "$(CLI_BIN)" 2>/dev/null | sed 's|^#!||'),)
PYTHON ?= $(if $(CLI_PY),$(CLI_PY),python3)
.PHONY: help install uninstall sync-skill test
help:
@echo "Usage: make [target]"
@echo ""
@echo " install Install mytoolkit in editable mode (current Python) and sync skill"
@echo " install Editable install into CLI Python + sync skill"
@echo " (refuse runner/_work trees; PYTHON=$(PYTHON))"
@echo " sync-skill Copy the bundled agent skill to ~/.agents/skills/mytoolkit/"
@echo " test Run the pytest suite"
@echo " uninstall Uninstall mytoolkit and remove shell completions"
# Canonical checkout: ~/Documents/myBin/mytoolkit (apaam/mytoolkit).
# Do NOT `pip install -e` from GHA _work or xiaohe packages/ submodule.
install:
@case "$(ROOT_DIR)" in \
*/_work/*|*/actions-runner/*|*/.xiaohe/actions-runner/*) \
echo "ERROR: refuse install from runner/worktree: $(ROOT_DIR)" >&2; \
echo "Use: cd ~/Documents/myBin/mytoolkit && make install" >&2; \
exit 1 ;; \
esac
@echo "Installing editable mytoolkit"
@echo " ROOT=$(ROOT_DIR)"
@echo " PYTHON=$(PYTHON)"
$(PYTHON) -m pip install -e "$(ROOT_DIR)" --upgrade
@echo "Installing shell completions…"
@mytoolkit completion install || echo "Warning: completion install failed"
@$(MAKE) -s sync-skill
@echo "Editable install:"
@$(PYTHON) -m pip show mytoolkit | awk '/^(Name|Version|Location|Editable project location):/'
@ed="$$($(PYTHON) -m pip show mytoolkit | awk -F': ' '/Editable project location:/ {print $$2}')"; \
case "$$ed" in \
*/_work/*|*/actions-runner/*) \
echo "ERROR: Editable still points at runner tree: $$ed" >&2; exit 1 ;; \
esac
sync-skill:
@echo "Syncing agent skill to ~/.agents/skills/mytoolkit/ ..."