build.sh, {subr,vars}/*: general cleanup.

1 files changed, 51 insertions, 52 deletions

diff --git a/vars/musl.vars b/vars/musl.vars
index 1c50fc74..5ba6e793 100644
--- a/vars/musl.vars
+++ b/vars/musl.vars
@@ -4,100 +4,99 @@
 #
 
 pkgp_musl_configure() {
-	build_fileop rm ${PKG_BUILD_DIR};
-	build_fileop mkdir ${PKG_BUILD_DIR};
-	build_fileop cd ${PKG_BUILD_DIR};
-	env	lz_cflags_cmdline=""		\
-		lz_debug="yes"			\
-	../lazy/lazy				\
-		-a ${ARCH}			\
-		-c gcc				\
-		-f ${PKG_PREFIX}		\
-		-n musl				\
-		-p ../musl-${PKG_MUSL_VERSION}	\
-		-t ${lz_target}			\
+	build_fileop rm "${PKG_BUILD_DIR}";
+	build_fileop mkdir "${PKG_BUILD_DIR}";
+	build_fileop cd "${PKG_BUILD_DIR}";
+	env	lz_cflags_cmdline=""			\
+		lz_debug="yes"				\
+	../lazy/lazy					\
+		-a "${ARCH}"				\
+		-c gcc					\
+		-f "${PKG_PREFIX}"			\
+		-n musl					\
+		-p "../musl-${PKG_MUSL_VERSION}"	\
+		-t "${lz_target}"			\
 		-x config;
 };
 
 pkg_musl_no_complex_all() {
-	local _install;
+	local _install _restart_at="${1}";
 	PKG_MUSL_VERSION="${PKG_MUSL_NO_COMPLEX_VERSION}";
 	# Git clone what we need.
 	pkg_fetch -git "lazy=${GITROOT}/lazy";
-	export lz_arch=${ARCH} lz_cflags_debug=-O2 lz_target=${TARGET};
+	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (no-complex)
 	_install=install_no_complex;
-	set_build_dir musl-${PKG_MUSL_VERSION}-${2} cross;
-	if ! is_build_script_done ${PKG_NAME} fetch; then
-		pkg_fetch http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz	\
-			${PKG_MUSL_NO_COMPLEX_SHA256SUM};
+	set_build_dir "musl-${PKG_MUSL_VERSION}" cross;
+	if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then
+		pkg_fetch "http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz"	\
+			"${PKG_MUSL_NO_COMPLEX_SHA256SUM}";
 		build_fileop rm mmglue;
 		pkg_fetch -git "mmglue=${GITROOT}/mmglue";
-		set_build_script_done ${PKG_NAME} fetch -extract;
+		set_build_script_done "${PKG_NAME}" fetch -extract;
 	fi;
-	if ! is_build_script_done ${PKG_NAME} extract; then
-		build_fileop rm musl-${PKG_MUSL_VERSION};
-		tar -xf ${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz;
-		set +o noglob; build_fileop cp mmglue/* musl-${PKG_MUSL_VERSION}/; set -o noglob;
-		set_build_script_done ${PKG_NAME} extract -configure;
+	if ! is_build_script_done "${PKG_NAME}" extract "${_restart_at}"; then
+		build_fileop rm "musl-${PKG_MUSL_VERSION}";
+		tar -xf "${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz";
+		set +o noglob;
+		 build_fileop cp mmglue/* "musl-${PKG_MUSL_VERSION}/";
+		set -o noglob;
+		set_build_script_done "${PKG_NAME}" extract -configure;
 	fi;
-	if ! is_build_script_done ${PKG_NAME} configure; then
+	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
 		pkgp_musl_configure;
-		set_build_script_done ${PKG_NAME} configure -build;
+		set_build_script_done "${PKG_NAME}" configure -build;
 	else
-		build_fileop cd ${PKG_BUILD_DIR};
+		build_fileop cd "${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done ${PKG_NAME} build; then
-		./lazy	-e ${_install}			\
-			-x build;
-		set_build_script_done ${PKG_NAME} build finish;
+	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+		./lazy -e "${_install}" -x build;
+		set_build_script_done "${PKG_NAME}" build finish;
 	fi;
 	exit 0;
 };
 
 pkg_musl_native_all() {
-	local _install;
+	local _install _restart_at="${1}";
 	PKG_MUSL_VERSION="${PKG_MUSL_NATIVE_VERSION}";
 	# Git clone what we need.
 	pkg_fetch -git "lazy=${GITROOT}/lazy";
-	export lz_arch=${ARCH} lz_cflags_debug=-O2 lz_target=${TARGET};
+	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (full)
 	_install=install;
-	set_build_dir musl-${PKG_MUSL_VERSION} native;
-	if ! is_build_script_done ${PKG_NAME} configure; then
+	set_build_dir "musl-${PKG_MUSL_VERSION}" native;
+	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
 		pkgp_musl_configure;
-		set_build_script_done ${PKG_NAME} configure -build;
+		set_build_script_done "${PKG_NAME}" configure -build;
 	else
-		build_fileop cd ${PKG_BUILD_DIR};
+		build_fileop cd "${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done ${PKG_NAME} build; then
-		./lazy	-e ${_install}			\
-			-x build;
-		build_fileop ln_symbolic ../lib/libc.so ${PKG_PREFIX}/bin/ldd;
-		set_build_script_done ${PKG_NAME} build finish;
+	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+		./lazy -e "${_install}" -x build;
+		build_fileop ln_symbolic ../lib/libc.so "${PKG_PREFIX}/bin/ldd";
+		set_build_script_done "${PKG_NAME}" build finish;
 	fi;
 	exit 0;
 };
 
 pkg_musl_full_all() {
-	local _install;
+	local _install _restart_at="${1}";
 	PKG_MUSL_VERSION="${PKG_MUSL_FULL_VERSION}";
 	# Git clone what we need.
 	pkg_fetch -git "lazy=${GITROOT}/lazy";
-	export lz_arch=${ARCH} lz_cflags_debug=-O2 lz_target=${TARGET};
+	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (full)
 	_install=install;
-	set_build_dir musl-${PKG_MUSL_VERSION} cross;
-	if ! is_build_script_done ${PKG_NAME} configure; then
+	set_build_dir "musl-${PKG_MUSL_VERSION}" cross;
+	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
 		pkgp_musl_configure;
-		set_build_script_done ${PKG_NAME} configure -build;
+		set_build_script_done "${PKG_NAME}" configure -build;
 	else
-		build_fileop cd ${PKG_BUILD_DIR};
+		build_fileop cd "${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done ${PKG_NAME} build; then
-		./lazy	-e ${_install}			\
-			-x build;
-		set_build_script_done ${PKG_NAME} build finish;
+	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+		./lazy -e "${_install}" -x build;
+		set_build_script_done "${PKG_NAME}" build finish;
 	fi;
 	exit 0;
 };