1 files changed, 39 insertions, 25 deletions

diff --git a/include/release.sh b/include/release.sh
index 4741b44a..fbcc5621 100644
--- a/include/release.sh
+++ b/include/release.sh
@@ -1,65 +1,79 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org>
 
-eval "`setvars "" vdir src_dirname relsrcdir relmode`"
+eval "`setvars "" reldir reldest vdir relsrcdir relmode`"
 
 release()
 {
 	export XBMK_RELEASE="y"
 
-	vdir="release"
+	reldir="release"
+
 	while getopts d:m: option; do
 		[ -z "$OPTARG" ] && err "empty argument not allowed"
 		case "$option" in
-		d) vdir="$OPTARG" ;;
+		d) reldir="$OPTARG" ;;
 		m) relmode="$OPTARG" ;;
 		*) err "invalid option '-$option'" ;;
 		esac
 	done
 
-	vdir="$vdir/$version"
-	src_dirname="${relname}_src"
-	relsrcdir="$vdir/$src_dirname"
+	reldest="$reldir/$version"
+	[ -e "$reldest" ] && \
+	    err "already exists: \"$reldest\""
+
+	vdir="$XBMK_CACHE/relpwd/${xbmktmp##*/}/$version"
+	relsrcdir="$vdir/${relname}_src"
 
-	[ -e "$vdir" ] && err "already exists: \"$vdir\""
-	x_ mkdir -p "$vdir"
+	remkdir "$vdir"
 	x_ git clone . "$relsrcdir"
-	x_ touch "$relsrcdir/lock"
 
-	build_release
+	fx_ prep_release printf "src\ntarball\nbin\n"
+	x_ rm -Rf "$relsrcdir"
+
+	x_ mkdir -p "$reldir"
+	x_ mv "$vdir" "$reldir"
+	x_ rm -Rf "${vdir%"/$version"}"
 
-	printf "\n\nDONE! Check release files under %s\n" "$vdir"
+	printf "\n\nDONE! Check release files under %s\n" "$reldest"
 }
 
-build_release()
+prep_release()
 {
+	x_ touch "$relsrcdir/lock"
 	(
-	x_ cd "$relsrcdir"
+	[ "$1" = "tarball" ] || x_ cd "$relsrcdir"
+	prep_release_$1
+	) || err "can't prep release $1"
+}
 
+prep_release_src()
+{
 	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"
+}
 
+prep_release_tarball()
+{
 	git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \
 	    --abbrev-commit > "$relsrcdir/CHANGELOG" || err "!log $relsrcdir"
 	x_ rm -f "$relsrcdir/lock"
-
+	x_ rm -Rf "$relsrcdir/cache" "$relsrcdir/tmp"
 	(
 	x_ cd "${relsrcdir%/*}"
 	x_ mktarball "${relsrcdir##*/}" "${relsrcdir##*/}.tar.xz"
-	) || err "can't create src tarball"
-	[ "$relmode" = "src" ] && return 0
+	) || err "can't create src tarball"; :
+}
 
-	x_ touch "$relsrcdir/lock"
-	(
-	x_ cd "$relsrcdir"
+prep_release_bin()
+{
+	[ "$relmode" = "src" ] && return 0
 	x_ ./mk -d coreboot
-	mk -b coreboot pico-serprog stm32-vserprog pcsx-redux
+	fx_ "x_ ./mk -b" printf \
+	    "coreboot\npico-serprog\nstm32-vserprog\npcsx-redux\n"
 
 	fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*"
 	x_ mv bin ../roms
-	) || err "can't build rom images"
-
-	x_ rm -Rf "$relsrcdir"
 }