minor code cleanup in the build system

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

build

@@ -128,8 +128,7 @@ fetch_trees()
 
 fail()
 {
-	tmp_cleanup || printf "WARNING: can't rm tmp files: %s\n" "$tmpdir" \
+	tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$tmpdir" 1>&2
-	    1>&2
 	err_ "${1}"
 }
 

include/git.sh

@@ -11,8 +11,7 @@ fetch_project_trees()
 	[ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \
 	    && fetch_project_repo "$project"
 	fetch_config
-	e "src/$project/$tree" d && return 0
+	e "src/$project/$tree" d || prepare_new_tree; return 0
-	prepare_new_tree
 }
 
 fetch_config()

include/vendor.sh

@@ -131,8 +131,7 @@ mkdirs()
 
 	mkdir -p "${1%/*}" || $err "mkdirs: !mkdir -p ${1%/*}"
 	remkdir "$appdir"
-	extract_archive "$_dl" "$appdir" || \
+	extract_archive "$_dl" "$appdir" || [ "$2" = "extract_e6400vga" ] || \
-	    [ "$2" = "extract_e6400vga" ] || \
 	    $err "mkdirs $1 $2: !extract"; return 0
 }
 

script/roms

@@ -152,10 +152,9 @@ configure_target()
 
 	[ -n "$_scandisk" ] && grub_scan_disk="$_scandisk"
 	[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata"
-	_ata=""
+
-	_ahci=""
+	eval "$(setvars "" _ata _ahci _nvme _grub_scan_disk)"
-	_nvme=""
+
-	_grub_scan_disk=""
 	for _disk in $grub_scan_disk; do
 		[ "$_disk" != "nvme" ] && [ "$_disk" != "ahci" ] && \
 		    [ "$_disk" != "ata" ] && _grub_scan_disk="nvme ahci ata" \