From a7d5ea15f3f233263eebc9818004bec3a46c1087 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 18:20:12 -0400
Subject: Simplify libreboot_setup_variables() w/ new func.

Reproducibility-related variable assignments are moved to a separate
function in order to make libreboot_setup_variables() less busy.
---
 libreboot | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index 4a3aceb3..9cb069e7 100755
--- a/libreboot
+++ b/libreboot
@@ -173,6 +173,28 @@ libreboot_setup_variables() {
 	local epoch_path="${root}/${DOTEPOCH}"
 	local rnd_seed_path="${root}/${DOTRNDSEED}"
 
+	if [[ -z "${VERSION}" ]]; then
+		if git_check "${root}"; then
+			VERSION="${BUILD_SYSTEM}-$(git_describe "${root}" 2> /dev/null || echo 'git')"
+		elif [[ -f "${version_path}" ]]; then
+			VERSION="$(cat "${version_path}")"
+		else
+			VERSION="${BUILD_SYSTEM}"
+		fi
+	fi
+
+	if [[ -d "${vboot_tools_path}/devkeys/" ]]; then
+		VBOOT_KEYS_PATH="${VBOOT_KEYS_PATH:-${vboot_tools_path}/devkeys/}"
+	fi
+
+	CONFIG_SHELL="${CONFIG_SHELL:-$(which bash)}"
+	EDITOR="${EDITOR:-$(which vi || true)}"
+	TASKS="${TASKS:-1}"
+
+	libreboot_setup_reproducible_builds_variables
+}
+
+libreboot_setup_reproducible_builds_variables() {
 	# Used by GCC, e.g., -frandom-seed="${RANDOM_SEED}"
 	if [[ -z "${RANDOM_SEED}" ]]; then
 		if [[ -f "${rnd_seed_path}" ]]; then
@@ -193,25 +215,7 @@ libreboot_setup_variables() {
 		fi
 	fi
 
-	if [[ -z "${VERSION}" ]]; then
-		if git_check "${root}"; then
-			VERSION="${BUILD_SYSTEM}-$(git_describe "${root}" 2> /dev/null || echo 'git')"
-		elif [[ -f "${version_path}" ]]; then
-			VERSION="$(cat "${version_path}")"
-		else
-			VERSION="${BUILD_SYSTEM}"
-		fi
-	fi
-
-	if [[ -d "${vboot_tools_path}/devkeys/" ]]; then
-		VBOOT_KEYS_PATH="${VBOOT_KEYS_PATH:-${vboot_tools_path}/devkeys/}"
-	fi
-
-	CONFIG_SHELL="${CONFIG_SHELL:-$(which bash)}"
-	EDITOR="${EDITOR:-$(which vi || true)}"
-	TASKS="${TASKS:-1}"
-
-	# Environment variables useful for creating reproducible builds
+	# Relevant only when libfaketime is preloaded
 	if [[ -n "${LIBFAKETIME_PATH}" ]]; then
 		BUILD_DATE_FMT="%Y-%m-%d %H:%M:%S"
 		BUILD_DATE="$(date -u -d "@${SOURCE_DATE_EPOCH}" "+${BUILD_DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "+${BUILD_DATE_FMT}" 2>/dev/null || date -u "+${BUILD_DATE_FMT}")"
-- 
cgit v1.2.3-70-g09d2


From 3b3c0a44752a41478ba4f0c734beb46fb6a9e216 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 18:30:10 -0400
Subject: Move vars CONFIG_SHELL,EDITOR,TASKS to libs/common

---
 libreboot   | 4 ----
 libs/common | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index 9cb069e7..1c7cb7a2 100755
--- a/libreboot
+++ b/libreboot
@@ -187,10 +187,6 @@ libreboot_setup_variables() {
 		VBOOT_KEYS_PATH="${VBOOT_KEYS_PATH:-${vboot_tools_path}/devkeys/}"
 	fi
 
-	CONFIG_SHELL="${CONFIG_SHELL:-$(which bash)}"
-	EDITOR="${EDITOR:-$(which vi || true)}"
-	TASKS="${TASKS:-1}"
-
 	libreboot_setup_reproducible_builds_variables
 }
 
diff --git a/libs/common b/libs/common
index e5b8d504..b1d2f571 100755
--- a/libs/common
+++ b/libs/common
@@ -43,6 +43,10 @@ ARCHIVE="tar.xz"
 CHECKSUM="sha256sum"
 DSIG="asc"
 
+CONFIG_SHELL="${CONFIG_SHELL:-$(which bash)}"
+EDITOR="${EDITOR:-$(which vi || true)}"
+TASKS="${TASKS:-1}"
+
 function_check() {
 	local function=$1
 
-- 
cgit v1.2.3-70-g09d2


From b2e3c041723a0416f9b678ead9bee100db4a4775 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 18:44:00 -0400
Subject: Replace calls to 'cat' w/ input redirection

---
 libreboot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index 1c7cb7a2..412dd95b 100755
--- a/libreboot
+++ b/libreboot
@@ -177,7 +177,7 @@ libreboot_setup_variables() {
 		if git_check "${root}"; then
 			VERSION="${BUILD_SYSTEM}-$(git_describe "${root}" 2> /dev/null || echo 'git')"
 		elif [[ -f "${version_path}" ]]; then
-			VERSION="$(cat "${version_path}")"
+			VERSION="$(< "${version_path}")"
 		else
 			VERSION="${BUILD_SYSTEM}"
 		fi
@@ -194,7 +194,7 @@ libreboot_setup_reproducible_builds_variables() {
 	# Used by GCC, e.g., -frandom-seed="${RANDOM_SEED}"
 	if [[ -z "${RANDOM_SEED}" ]]; then
 		if [[ -f "${rnd_seed_path}" ]]; then
-			RANDOM_SEED="$(cat "${rnd_seed_path}")"
+			RANDOM_SEED="$(< "${rnd_seed_path}")"
 		else
 			RANDOM_SEED="${RANDOM}" # True randomness is unnecessary
 		fi
@@ -205,7 +205,7 @@ libreboot_setup_reproducible_builds_variables() {
 		if git_check "${root}"; then
 			SOURCE_DATE_EPOCH="$(git log -1 --format=%ct)"
 		elif [[ -f "${epoch_path}" ]]; then
-			SOURCE_DATE_EPOCH="$(cat "${epoch_path}")"
+			SOURCE_DATE_EPOCH="$(< "${epoch_path}")"
 		else
 			SOURCE_DATE_EPOCH="$(date +%s)"
 		fi
-- 
cgit v1.2.3-70-g09d2


From 101e236f3dbb277926f1b460e303d425d3483075 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 18:53:59 -0400
Subject: Clean up case forms in libreboot_{project,tool}()

---
 libreboot | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index 412dd95b..c3384b7a 100755
--- a/libreboot
+++ b/libreboot
@@ -77,8 +77,8 @@ libreboot_project() {
 	project="$1"
 	shift
 
-	case ${action} in
-		"sources")
+	case "${action}" in
+		'sources')
 			(
 				set +e
 
@@ -86,12 +86,12 @@ libreboot_project() {
 				project_action_arguments "download" "${project}" "$@" && return 0
 			)
 			;;
-		"produce")
+		'produce')
 			for action in "build" "install" "release"; do
 				project_action_arguments "${action}" "${project}" "$@"
 			done
 			;;
-		"test")
+		'test')
 			for action in ${PROJECT_ACTIONS}; do
 				project_action_arguments "${action}" "${project}" "$@"
 			done
@@ -115,20 +115,14 @@ libreboot_tool() {
 	tool="$1"
 	shift
 
-	case ${action} in
-		*)
-			if ! tool_function_check "${tool}" "${action}"; then
-				libreboot_usage
-				exit 1
-			fi
-
-			if [[ "${action}" == "usage" ]]; then
-				tool_action "${action}" "${tool}" "$@"
-			else
-				tool_action_arguments_recursive "${action}" "${tool}" "$@"
-			fi
-			;;
-	esac
+	if ! tool_function_check "${tool}" "${action}"; then
+		libreboot_usage
+		exit 1
+	elif [[ "${action}" == 'usage' ]]; then
+		tool_action "${action}" "${tool}" "$@"
+	else
+		tool_action_arguments_recursive "${action}" "${tool}" "$@"
+	fi
 }
 
 libreboot_setup() {
-- 
cgit v1.2.3-70-g09d2


From 59f05b2699208d9a8379fefc178d4db5c55cb1c8 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 18:56:22 -0400
Subject: Remove hard dependency on wget

---
 libreboot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index c3384b7a..7a872463 100755
--- a/libreboot
+++ b/libreboot
@@ -231,7 +231,7 @@ libreboot() {
 		exit 1
 	fi
 
-	requirements 'tar' 'sed' 'gpg' 'sha256sum' 'wget'
+	requirements 'tar' 'sed' 'gpg' 'sha256sum'
 
 	if project_check "${target}"; then
 		libreboot_project "${action}" "${target}" "$@"
-- 
cgit v1.2.3-70-g09d2


From 56236fdb1d2faf540e1da199d3228606b944ddad Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 19:22:18 -0400
Subject: Simplify libreboot_setup() and libreboot()

---
 libreboot | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index 7a872463..0c3db108 100755
--- a/libreboot
+++ b/libreboot
@@ -129,20 +129,11 @@ libreboot_setup() {
 	root="$(readlink -f "$(dirname "$0")")"
 	executable="$(basename "$0")"
 
-	local requirements="git"
-	local requirement_path
-
 	libreboot_setup_include
-	libreboot_setup_variables
 
-	for requirement in ${requirements}; do
-		requirement_path="$(which "${requirement}" || true)"
+	requirements 'tar' 'sed' 'gpg' 'sha256sum' 'git'
 
-		if [[ -z "${requirement_path}" ]]; then
-			printf '%s\n' "Missing requirement: ${requirement}" >&2
-			exit 1
-		fi
-	done
+	libreboot_setup_variables
 }
 
 libreboot_setup_include() {
@@ -226,13 +217,6 @@ libreboot() {
 
 	libreboot_setup "$@"
 
-	if [[ -z "${action}" ]] || [[ -z "${target}" ]]; then
-		libreboot_usage
-		exit 1
-	fi
-
-	requirements 'tar' 'sed' 'gpg' 'sha256sum'
-
 	if project_check "${target}"; then
 		libreboot_project "${action}" "${target}" "$@"
 	elif tool_check "${target}"; then
-- 
cgit v1.2.3-70-g09d2


From 02f973efd42f566cfe672e091cd4e67deb9a0cc0 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 17 Jul 2017 19:27:01 -0400
Subject: Alter whitespace in printf statements for readability

---
 libreboot | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'libreboot')

diff --git a/libreboot b/libreboot
index 0c3db108..bb6e4141 100755
--- a/libreboot
+++ b/libreboot
@@ -31,10 +31,9 @@ libreboot_usage() {
 	done
 
 	printf '\n%s\n' 'Virtual project actions:' >&2
-
-	printf '%s\n' '  sources'
-	printf '%s\n' '  produce'
-	printf '%s\n' '  test'
+	printf '%s\n'   '  sources'
+	printf '%s\n'   '  produce'
+	printf '%s\n'   '  test'
 
 	printf '\n%s\n' 'Project targets:' >&2
 
@@ -59,16 +58,16 @@ libreboot_usage() {
 	done
 
 	printf '\n%s\n' 'Environment variables:' >&2
-	printf '%s\n' '  PROJECTS_FORCE - Projects to always perform actions for' >&2
-	printf '%s\n' '  TOOLS_FORCE - Tools to always perform actions for' >&2
-	printf '%s\n' '  RELEASE_KEY - GPG key to use for release' >&2
-	printf '%s\n' '  VBOOT_KEYS_PATH - Path to the vboot keys' >&2
-	printf '%s\n' '  LIBFAKETIME_PATH - Path to the libfaketime shared library' >&2
-	printf '%s\n' '  TASKS - Number of simultaneous tasks to run' >&2
-	printf '%s\n' '  VERSION - Version string to use' >&2
+	printf '%s\n'   '  PROJECTS_FORCE - Projects to always perform actions for' >&2
+	printf '%s\n'   '  TOOLS_FORCE - Tools to always perform actions for' >&2
+	printf '%s\n'   '  RELEASE_KEY - GPG key to use for release' >&2
+	printf '%s\n'   '  VBOOT_KEYS_PATH - Path to the vboot keys' >&2
+	printf '%s\n'   '  LIBFAKETIME_PATH - Path to the libfaketime shared library' >&2
+	printf '%s\n'   '  TASKS - Number of simultaneous tasks to run' >&2
+	printf '%s\n'   '  VERSION - Version string to use' >&2
 
 	printf '\n%s\n' 'Configuration files:' >&2
-	printf '%s\n' "  ${BUILD_SYSTEM}.conf - Environment variables configuration" >&2
+	printf '%s\n'   "  ${BUILD_SYSTEM}.conf - Environment variables configuration" >&2
 }
 
 libreboot_project() {
-- 
cgit v1.2.3-70-g09d2