From 7c58ae4cdf4c31188a581ca7685bda889132dda9 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Sat, 2 Nov 2019 20:51:24 -0500
Subject: Remove redundant subshells in project actions

Since an action is performed within a subshell there is no need
for a second subshell to handle errors.
---
 projects/grub/grub       | 30 +++++++++++++-----------------
 projects/ich9gen/ich9gen | 17 +++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

(limited to 'projects')

diff --git a/projects/grub/grub b/projects/grub/grub
index 75d29380..ada5c338 100755
--- a/projects/grub/grub
+++ b/projects/grub/grub
@@ -75,28 +75,24 @@ build() {
 	local build_path="$(project_build_path "$project" "$@")"
 	local raw_keymap_path="$project_path/$CONFIGS/keymaps"
 
-	(
-		set -e
+	mkdir -p "$build_path"
 
-		mkdir -p "$build_path"
+	grub_build_utils
 
-		grub_build_utils
-
-		if [[ "$target" == 'bios' ]]; then
-		    grub_build_floppy_image
-		else
-		    grub_build_standalone_image
-		fi
+	if [[ "$target" == 'bios' ]]; then
+		grub_build_floppy_image
+	else
+		grub_build_standalone_image
+	fi
 
-		for raw_keymap in "$raw_keymap_path"/*; do
-		    grub_build_layout "$raw_keymap"
-		done
+	for raw_keymap in "$raw_keymap_path"/*; do
+		grub_build_layout "$raw_keymap"
+	done
 
-		grub_build_font
-		grub_copy_modules
+	grub_build_font
+	grub_copy_modules
 
-		make -C "$sources_path" distclean
-	)
+	make -C "$sources_path" distclean
 }
 
 build_check() {
diff --git a/projects/ich9gen/ich9gen b/projects/ich9gen/ich9gen
index 71567329..5ba9ae2f 100755
--- a/projects/ich9gen/ich9gen
+++ b/projects/ich9gen/ich9gen
@@ -58,23 +58,20 @@ build() {
 	fi
 
 	local sources_path="$(project_sources_path "$project" "$repository" "$@")"
-
 	local build_path="$(project_build_path "$project" "$@")"
 
 	mkdir -p "$build_path"
 	make -C "$sources_path" -j"$TASKS" ich9gen
 
-	(
-		local macaddress="$(ich9gen_macaddress)"
+	local macaddress="$(ich9gen_macaddress)"
 
-		cd "$build_path"
+	cd "$build_path"
 
-		if [[ -n $macaddress ]]; then
-			"$sources_path"/ich9gen --macaddress "$macaddress"
-		else
-			"$sources_path"/ich9gen
-		fi
-	)
+	if [[ -n $macaddress ]]; then
+		"$sources_path"/ich9gen --macaddress "$macaddress"
+	else
+		"$sources_path"/ich9gen
+	fi
 
 	cp "$sources_path/ich9gen" "$build_path"
 	make -C "$sources_path" clean
-- 
cgit v1.2.3-70-g09d2