new AGENTS.md
ober
ab781080c4b6364ef81a5bfc33b9ebe3a95c3385
--- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ export JSH_VERSION_SHORT JERBOA_VERSION ?= v0.2.0 JERBOA_TOOL_DIR ?= $(CURDIR)/.jerboa/bin JERBOA_SHELL_EXTRAS_URL ?= https://git.sr.ht/~lisp/jerboa-shell-extras -JERBOA_SHELL_EXTRAS_DIR ?= $(CURDIR)/_vendor/jerboa-shell-extras +JERBOA_SHELL_EXTRAS_DIR ?= $(CURDIR)/vendor/jerboa-shell-extras JSH_EXTRAS_EMBED_CONF ?= $(CURDIR)/.jsh-extras-embed.conf JSH_EXTRAS_DEFAULT_EMBED ?= $(shell if [ -d $(HOME)/.embed ]; then echo $(HOME)/.embed; else echo $(JERBOA_SHELL_EXTRAS_DIR)/embed; fi) JERBUILD ?= $(shell if [ -x ./jerbuild ]; then echo ./jerbuild; \ @@ -89,7 +89,7 @@ SHELL_MODULES = ast registry macros pregexp-compat util environment lexer arithm history parser functions signals expander redirect control jobs builtins \ pipeline executor completion prompt lineedit script startup main -OILS_DIR := _vendor/oils +OILS_DIR := vendor/oils OILS_REPOSITORY ?= https://github.com/oils-for-unix/oils.git OILS_COMMIT ?= 15de8fd779569e6e3a9f5fcbfc00e7df0ebe0380 OILS_TREE ?= f95f91004abcfdb82dd413e6ef2a7c71591f23d6 @@ -141,7 +141,7 @@ ensure-shell-extras: echo "=== Fetching jerboa-shell-extras ==="; \ mkdir -p "$$(dirname "$(JERBOA_SHELL_EXTRAS_DIR)")"; \ git clone "$(JERBOA_SHELL_EXTRAS_URL)" "$(JERBOA_SHELL_EXTRAS_DIR)"; \ - elif [ "$(JERBOA_SHELL_EXTRAS_DIR)" = "$(CURDIR)/_vendor/jerboa-shell-extras" ]; then \ + elif [ "$(JERBOA_SHELL_EXTRAS_DIR)" = "$(CURDIR)/vendor/jerboa-shell-extras" ]; then \ echo "=== Updating jerboa-shell-extras ==="; \ git -C "$(JERBOA_SHELL_EXTRAS_DIR)" pull --ff-only; \ fi --- a/test/test-make-extras.sh +++ b/test/test-make-extras.sh @@ -33,7 +33,7 @@ print-default-extras-dir: @printf '%s\n' "$(JERBOA_SHELL_EXTRAS_DIR)" EOF )" -[ "$default_extras_dir" = "$ROOT/_vendor/jerboa-shell-extras" ] || +[ "$default_extras_dir" = "$ROOT/vendor/jerboa-shell-extras" ] || fail "extras checkout must always be the vendored copy, got: $default_extras_dir" if grep -Eq '\.\./jerboa-shell-extras|\$\{?HOME\}?/mine' Makefile; then --- a/tools/sbom.sh +++ b/tools/sbom.sh @@ -27,7 +27,7 @@ hash_manifest() { ! -path '*/.git/*' \ ! -path '*/dist/*' \ ! -path '*/.jerboa/*' \ - ! -path '*/_vendor/*' \ + ! -path '*/vendor/*' \ -print | LC_ALL=C sort | while IFS= read -r file; do hash_file_with_label "$file" "$file" done) > "$out"