From 82e5f8d5fc8aa8bfe013b84460b296ce188ab7da Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 30 Aug 2015 15:49:01 +0100
Subject: build/config/coreboot{replace,update}: for function for for loop

---
 .../scripts/helpers/build/config/corebootreplace   | 29 +++++++++----------
 .../scripts/helpers/build/config/corebootupdate    | 33 +++++++++++-----------
 2 files changed, 30 insertions(+), 32 deletions(-)

(limited to 'resources/scripts/helpers')

diff --git a/resources/scripts/helpers/build/config/corebootreplace b/resources/scripts/helpers/build/config/corebootreplace
index d5fdcb29..0c41c9e1 100755
--- a/resources/scripts/helpers/build/config/corebootreplace
+++ b/resources/scripts/helpers/build/config/corebootreplace
@@ -25,23 +25,22 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-cd "resources/libreboot/config/grub/"
+hackconfig () {
+	cd "coreboot/"
 
-if [ $# -lt 1 ]; then
-	configs="$(for config in *; do printf "%s\n" "${config}"; done)"
-else
-	configs="${*}"
-fi
-
-cd "../../../../coreboot/"
-for config in ${configs}; do
-	printf "Replacing or creating new config for %s\n" "${config}"
+	printf "Replacing or creating new config for %s\n" "${1}"
 	sleep 2
-
+	
 	make menuconfig
 
-	[ ! -d "../resources/libreboot/config/grub/${config}/" ] && mkdir -p "../resources/libreboot/config/grub/${config}/"
-	mv ".config" "../resources/libreboot/config/grub/${config}/config"
-done
+	[ ! -d "../resources/libreboot/config/grub/${1}/" ] && mkdir -p "../resources/libreboot/config/grub/${1}/"
+	mv ".config" "../resources/libreboot/config/grub/${1}/config"
 
-cd "../"
+	cd "../"
+}
+
+if [ $# -lt 1 ]; then
+	for config in resources/libreboot/config/grub/*; do hackconfig "${config##*/}"; done
+else
+	for config in "${@}"; do hackconfig "${config}"; done
+fi
diff --git a/resources/scripts/helpers/build/config/corebootupdate b/resources/scripts/helpers/build/config/corebootupdate
index 64fcd753..6e612a84 100755
--- a/resources/scripts/helpers/build/config/corebootupdate
+++ b/resources/scripts/helpers/build/config/corebootupdate
@@ -25,27 +25,26 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-cd "resources/libreboot/config/grub/"
+hackconfig () {
+	cd "coreboot/"
 
-if [ $# -lt 1 ]; then
-	configs="$(for i in *; do printf "%s\n" "${i}"; done)"
-else
-	configs="${*}"
-fi
-
-cd "../../../../coreboot/"
-for config in ${configs}; do
-	printf "Updating config for %s\n" "${config}"
+	printf "Updating config for %s\n" "${1}"
 	sleep 2
 
-	if [ ! -d "../resources/libreboot/config/grub/${config}/" ]; then
-		printf "build/config/corebootupdate WARNING: config '%s' does not exist. Skipping.\n" "${config}"
-		continue
+	if [ ! -d "../resources/libreboot/config/grub/${1}/" ]; then
+		printf "build/config/corebootupdate WARNING: config '%s' does not exist. Skipping.\n" "${1}"
+		return
 	fi
 	
-	mv "../resources/libreboot/config/grub/${config}/config" ".config"
+	mv "../resources/libreboot/config/grub/${1}/config" ".config"
 	make oldconfig
-	mv ".config" "../resources/libreboot/config/grub/${config}/config"
-done
+	mv ".config" "../resources/libreboot/config/grub/${1}/config"
 
-cd "../"
+	cd "../"
+}
+
+if [ $# -lt 1 ]; then
+	for config in resources/libreboot/config/grub/*; do hackconfig "${config##*/}"; done
+else
+	for config in "${@}"; do hackconfig "${config}"; done
+fi
-- 
cgit v1.2.3-70-g09d2