From ee2bca65f6e8eb8b1732803aece31c0eee03aaed Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 5 Oct 2025 01:21:26 +0100 Subject: Revert "init.sh: explicitly create cache/" This reverts commit 23f98c29581e7d2cf5639e93fd89a6e64bec5635. --- include/init.sh | 2 +- include/release.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/init.sh b/include/init.sh index 49863bee..6bed6ca4 100644 --- a/include/init.sh +++ b/include/init.sh @@ -58,7 +58,7 @@ xbmk_init() fi export PWD="$xbmkpwd" - x_ xbmkdir "$basetmp" "cache" + x_ xbmkdir "$basetmp" for init_cmd in get_version set_env set_threads git_init child_exec; do if ! xbmk_$init_cmd "$@"; then diff --git a/include/release.sh b/include/release.sh index 8c89465e..339ab3f5 100644 --- a/include/release.sh +++ b/include/release.sh @@ -64,6 +64,9 @@ prep_release() ( if [ "$1" != "tarball" ]; then x_ cd "$rsrc" + if [ ! -e "cache" ]; then + x_ ln -s "$XBMK_CACHE" "cache" + fi fi prep_release_$1 @@ -101,8 +104,8 @@ prep_release_tarball() --abbrev-commit > "$rsrc/CHANGELOG" || \ err "can't create '$rsrc/CHANGELOG'" "prep_release_tarball" "$@" - x_ rm -f "$rsrc/lock" - x_ rm -Rf "$rsrc/xbmkwd" "$rsrc/util/sbase" "$rsrc/cache" + x_ rm -f "$rsrc/lock" "$rsrc/cache" + x_ rm -Rf "$rsrc/xbmkwd" "$rsrc/util/sbase" x_ mv "$rsrc/util/sbase2" "$rsrc/util/sbase" ( -- cgit v1.2.1