From 4e50a92041c9f30deef1a32c995b9d5634cbed22 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Fri, 23 Jun 2017 13:55:22 -0400
Subject: Remove unnecessary 'env' invocation from printf.

This reverts part of pull request #217 which called the 'env'
binary for each printf invocation.
---
 .../libreboot-release/install/libreboot-release    | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'projects/libreboot-release/install')

diff --git a/projects/libreboot-release/install/libreboot-release b/projects/libreboot-release/install/libreboot-release
index 28674391..58a384f0 100644
--- a/projects/libreboot-release/install/libreboot-release
+++ b/projects/libreboot-release/install/libreboot-release
@@ -27,18 +27,18 @@ SHA256SUM="sha256sum"
 ASC="asc"
 
 usage() {
-	env printf '%s\n' "$executable [action] [projects...]" >&2
-
-	env printf '\n%s\n' 'Actions:' >&2
-	env printf '%s\n' '  download - Download project files' >&2
-	env printf '%s\n' '  sources - Download project sources' >&2
-	env printf '%s\n' '  verify - Verify project files' >&2
-	env printf '%s\n' '  extract - Extract project files' >&2
-	env printf '%s\n' '  prepare - Download, verify and extract project files' >&2
-
-	env printf '\n%s\n' 'Environment variables:' >&2
-	env printf '%s\n' '  MACHINE - Machine architecture to use' >&2
-	env printf '%s\n' '  DOWNLOAD_URL - Base URL to download files from' >&2
+	printf '%s\n' "$executable [action] [projects...]" >&2
+
+	printf '\n%s\n' 'Actions:' >&2
+	printf '%s\n' '  download - Download project files' >&2
+	printf '%s\n' '  sources - Download project sources' >&2
+	printf '%s\n' '  verify - Verify project files' >&2
+	printf '%s\n' '  extract - Extract project files' >&2
+	printf '%s\n' '  prepare - Download, verify and extract project files' >&2
+
+	printf '\n%s\n' 'Environment variables:' >&2
+	printf '%s\n' '  MACHINE - Machine architecture to use' >&2
+	printf '%s\n' '  DOWNLOAD_URL - Base URL to download files from' >&2
 }
 
 download() {
@@ -76,7 +76,7 @@ download() {
 				wget -O "$path.$SHA256SUM" "$url.$SHA256SUM"
 				wget -O "$path.$ASC" "$url.$ASC"
 
-				env printf '\n%s\n' "Downloaded $project"
+				printf '\n%s\n' "Downloaded $project"
 
 				return 0
 			fi
@@ -85,7 +85,7 @@ download() {
 		IFS=$ifs_save
 	done
 
-	env printf '%s\n' "Could not download $project from $DOWNLOAD_URL" >&2
+	printf '%s\n' "Could not download $project from $DOWNLOAD_URL" >&2
 	return 1
 }
 
@@ -102,9 +102,9 @@ sources() {
 		wget -O "$path.$SHA256SUM" "$url.$SHA256SUM"
 		wget -O "$path.$ASC" "$url.$ASC"
 
-		env printf '\n%s\n' "Downloaded $project sources"
+		printf '\n%s\n' "Downloaded $project sources"
 	else
-		env printf '%s\n' "Could not download $project sources from $DOWNLOAD_URL" >&2
+		printf '%s\n' "Could not download $project sources from $DOWNLOAD_URL" >&2
 		return 1
 	fi
 
@@ -153,17 +153,17 @@ verify() {
 					sha256sum -c "$project.$TAR_XZ.$SHA256SUM"
 				)
 			else
-				env printf '%s\n' "Could not verify $project checksum!" >&2
+				printf '%s\n' "Could not verify $project checksum!" >&2
 			fi
 
 			if [ -f "$signature_path" ]
 			then
 				gpg --armor --verify "$signature_path" "$path"
 			else
-				env printf '%s\n' "Could not verify $project signature!" >&2
+				printf '%s\n' "Could not verify $project signature!" >&2
 			fi
 
-			env printf '\n%s\n' "Verified $project"
+			printf '\n%s\n' "Verified $project"
 
 			return 0
 		done
@@ -171,7 +171,7 @@ verify() {
 		IFS=$ifs_save
 	done
 
-	env printf '%s\n' "Could not verify $project" >&2
+	printf '%s\n' "Could not verify $project" >&2
 	return 1
 }
 
@@ -209,7 +209,7 @@ extract() {
 
 			if [ "$prefix" = "$SYSTEMS/$MACHINE" ]
 			then
-				env printf '%s\n' "Skiping $project extract"
+				printf '%s\n' "Skiping $project extract"
 				return 0
 			fi
 
@@ -217,7 +217,7 @@ extract() {
 
 			tar -xf "$path" -ps -C "$extract_path"
 
-			env printf '%s\n' "Extracted $project"
+			printf '%s\n' "Extracted $project"
 
 			return 0
 		done
@@ -225,7 +225,7 @@ extract() {
 		IFS=$ifs_save
 	done
 
-	env printf '%s\n' "Could not extract $project" >&2
+	printf '%s\n' "Could not extract $project" >&2
 	return 1
 }
 
@@ -239,7 +239,7 @@ requirements() {
 
 		if [ -z "$requirement_path" ]
 		then
-			env printf '%s\n' "Missing requirement: $requirement" >&2
+			printf '%s\n' "Missing requirement: $requirement" >&2
 			exit 1
 		fi
 	done
@@ -256,7 +256,7 @@ setup() {
 
 	if [ -z "$DOWNLOAD_URL" ]
 	then
-		env printf '%s\n' 'Missing download URL' >&2
+		printf '%s\n' 'Missing download URL' >&2
 		exit 1
 	fi
 }
-- 
cgit v1.2.3-70-g09d2