build/release/src: split logic into functions

main() on top

top-down logic

Signed-off-by: Leah Rowe <leah@libreboot.org>

resources/scripts/build/release/src

@@ -1,9 +1,8 @@
 #!/usr/bin/env sh
 
-#
 #  helper script: generate release archive (source code)
 #
-#	Copyright (C) 2020,2021 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2020,2021,2023 Leah Rowe <info@minifree.org>
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
@@ -19,29 +18,44 @@
 #	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# This script assumes that the working directory is the root
-# of git or release archive
-
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
 projectname="$(cat projectname)"
-
+modlist="coreboot flashrom grub memtest86plus seabios me_cleaner u-boot bios_extract"
+dirlist="resources util" # do not add blobs directory here. it is handled below
+filelist="blobutil modify download build README.md COPYING Makefile update version versiondate projectname .gitcheck gitclone"
 version="version-unknown"
-if [ -f version ]; then
-	version="$(cat version)"
-fi
 versiondate="version-date-unknown"
-if [ -f versiondate ]; then
+reldir=""
-	versiondate="$(cat versiondate)"
+dirname=""
-fi
+srcdir=""
 
+printf "Building source code archive, version %s\n" "${version}"
+
+main()
+{
+	[ -f version ] && \
+		version="$(cat version)"
+	[ -f versiondate ] && \
+		versiondate="$(cat versiondate)"
+
+	create_release_directory
+	download_modules
+	copy_files
+	purge_files
+
+	create_release_archive
+
+	printf "Source code archive available at %s.tar.xz\n\n" "${srcdir}"
+}
+
+create_release_directory()
+{
 	reldir="release/${version}"
 	dirname="${projectname}-${version}_src"
 	srcdir="${reldir}/${dirname}"
 
-printf "Building source code archive, version %s\n" "${version}"
-
 	[ ! -d "release/" ] && mkdir -p release/
 	[ ! -d "${reldir}/" ] && mkdir -p "${reldir}/"
 	[ -d "${srcdir}/" ] && \
@@ -50,23 +64,38 @@ printf "Building source code archive, version %s\n" "${version}"
 		rm -f "${srcdir}.tar.xz/"
 
 	mkdir -p "${srcdir}/"
-
 	printf "%s" "${version}" > "${srcdir}"/version
+}
 
-modlist="coreboot flashrom grub memtest86plus seabios me_cleaner u-boot bios_extract"
+download_modules()
-dirlist="resources util" # do not add blobs directory here. it is handled below
+{
-filelist="blobutil modify download build README.md COPYING Makefile update version versiondate projectname .gitcheck gitclone"
-
 	for modname in ${modlist}; do
 		if [ ! -d "${modname}/" ]; then
 			./download ${modname}
 		fi
 	done
+}
 
+copy_files()
+{
 	for dir in ${modlist} ${dirlist}; do
 		cp -R "${dir}/" "${srcdir}/"
 	done
 
+	copy_blobs
+
+	for i in ${filelist}; do
+		if [ ! -f "${i}" ]; then
+			printf "build/release/src: ERROR: file '%s' does not exist.\n" "${i}"
+			rm -Rf "${srcdir}"
+			exit 1
+		fi
+		cp ${i} "${srcdir}/"
+	done
+}
+
+copy_blobs()
+{
 	mkdir -p "${srcdir}"/blobs
 	# do not copy intel ME etc, but do copy ifd/gbe files
 	for i in t440p xx20 xx30 hp8200sff hp_ivybridge hp_sandybridge; do
@@ -79,20 +108,15 @@ for i in t440p xx20 xx30 hp8200sff hp_ivybridge hp_sandybridge; do
 			fi
 		done
 	done
+}
 
-for i in ${filelist}; do
+purge_files()
-    if [ ! -f "${i}" ]; then
+{
-        printf "build/release/src: ERROR: file '%s' does not exist.\n" "${i}"
-        rm -Rf "${srcdir}"
-        exit 1
-    fi
-    cp ${i} "${srcdir}/"
-done
-
 	(
 	cd "${srcdir}/coreboot/"
 	for i in *; do
-        [ ! -d "${i}" ] && continue
+		[ ! -d "${i}" ] && \
+			continue
 		(
 		cd "${i}/"
 		make distclean
@@ -112,7 +136,10 @@ done
 	rm -Rf coreboot/*/util/nvidia/cbootimage/.git*
 	rm -Rf u-boot/u-boot/ u-boot/*/.git*
 	)
+}
 
+create_release_archive()
+{
 	(
 	cd "${reldir}/"
 	printf "%s\n" "${version}" > "${dirname}/version"
@@ -121,6 +148,6 @@ printf "%s\n" "${projectname}" > "${dirname}/projectname"
 	tar -c "${dirname}/" | xz -9e >"${dirname}.tar.xz"
 	rm -Rf "${dirname}/"
 	)
+}
 
-printf "Source code archive available at %s.tar.xz\n\n" "${srcdir}"
+main $@
-