From 92954eeb38f69ebc0cfef7b9629e96a1599667be Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 19:20:50 +0100 Subject: lib.sh: remove rmgit() We don't need to call it from git.sh, because it's only being done when building a release anyway, and we already run rmgit when doing a release. The function itself is only two simple fx_ calls, so we can just do that from build_release(). Signed-off-by: Leah Rowe --- include/git.sh | 3 --- include/lib.sh | 6 ------ include/release.sh | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/git.sh b/include/git.sh index b65bd196..0091c832 100644 --- a/include/git.sh +++ b/include/git.sh @@ -57,9 +57,6 @@ git_prep() dx_ fetch_submodule "$mdir/module.list" fi - [ "$_loc" != "$XBMK_CACHE/repo/$project" ] && \ - [ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit" - [ "$_loc" = "${_loc%/*}" ] || x_ mkdir -p "${_loc%/*}" x_ mv "$tmpgit" "$_loc" } diff --git a/include/lib.sh b/include/lib.sh index cb3ba6cc..cf4305a1 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -29,12 +29,6 @@ mktarball() x_ tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || err "mktarball2, $1" } -rmgit() -{ - fx_ "x_ rm -Rf" x_ find "$1" -name ".git" - fx_ "x_ rm -Rf" x_ find "$1" -name ".gitmodules" -} - e() { es_t="e" && [ $# -gt 1 ] && es_t="$2" diff --git a/include/release.sh b/include/release.sh index 0afb777f..be221d19 100644 --- a/include/release.sh +++ b/include/release.sh @@ -37,7 +37,8 @@ build_release() x_ cd "$relsrcdir" x_ ./mk -f - rmgit . + fx_ "x_ rm -Rf" x_ find . -name ".git" + fx_ "x_ rm -Rf" x_ find . -name ".gitmodules" x_ mv src/docs docs ) || err "can't create release files" -- cgit v1.2.1