summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild3
-rwxr-xr-xinclude/git.sh3
-rwxr-xr-xinclude/vendor.sh3
-rwxr-xr-xscript/roms7
4 files changed, 6 insertions, 10 deletions
diff --git a/build b/build
index bec2c67b..19ed8875 100755
--- a/build
+++ b/build
@@ -128,8 +128,7 @@ fetch_trees()
fail()
{
- tmp_cleanup || printf "WARNING: can't rm tmp files: %s\n" "$tmpdir" \
- 1>&2
+ tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$tmpdir" 1>&2
err_ "${1}"
}
diff --git a/include/git.sh b/include/git.sh
index 3ee27fc6..46b63014 100755
--- a/include/git.sh
+++ b/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
- prepare_new_tree
+ e "src/$project/$tree" d || prepare_new_tree; return 0
}
fetch_config()
diff --git a/include/vendor.sh b/include/vendor.sh
index 4a0e7ae6..b2fc5346 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -131,8 +131,7 @@ mkdirs()
mkdir -p "${1%/*}" || $err "mkdirs: !mkdir -p ${1%/*}"
remkdir "$appdir"
- extract_archive "$_dl" "$appdir" || \
- [ "$2" = "extract_e6400vga" ] || \
+ extract_archive "$_dl" "$appdir" || [ "$2" = "extract_e6400vga" ] || \
$err "mkdirs $1 $2: !extract"; return 0
}
diff --git a/script/roms b/script/roms
index 79b716ff..3ccd8728 100755
--- a/script/roms
+++ b/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=""
- _nvme=""
- _grub_scan_disk=""
+
+ eval "$(setvars "" _ata _ahci _nvme _grub_scan_disk)"
+
for _disk in $grub_scan_disk; do
[ "$_disk" != "nvme" ] && [ "$_disk" != "ahci" ] && \
[ "$_disk" != "ata" ] && _grub_scan_disk="nvme ahci ata" \