Fixed printf calls & replaced 'echo' w/ printf.

All printf calls should now be properly formatted; prior, the
format specifier string was erroneously used for both the format
specifiers and the string to be printed.  'env' is now used to
locate the printf binary so as to avoid potentially using a shell
builtin.  Lastly, all calls to 'echo' within the new build system
have been replaced with printf for consistency/portability purposes.

1 files changed, 27 insertions, 27 deletions

diff --git a/projects/cros-scripts/install/cros-boot-keys b/projects/cros-scripts/install/cros-boot-keys
index 416b7604..dffdc9b9 100755
--- a/projects/cros-scripts/install/cros-boot-keys
+++ b/projects/cros-scripts/install/cros-boot-keys
@@ -31,16 +31,16 @@ ALGORITHMS="7 7 11 7 7 4 11 11 11"
 MODES="7 7 11 7 10"
 
 usage() {
-	printf "$executable [action]\n" >&2
+	env printf '%s\n' "$executable [action]" >&2
 
-	printf "\nActions:\n" >&2
-	printf "  generate - Generate a set of keys\n" >&2
-	printf "  verify - Verify keyblocks\n" >&2
+	env printf '\n%s\n' 'Actions:' >&2
+	env printf '%s\n' '  generate - Generate a set of keys' >&2
+	env printf '%s\n' '  verify - Verify keyblocks' >&2
 
-	printf "\nEnvironment variables:\n" >&2
-	printf "  KEYS_VERSION - Version to give the keys\n" >&2
-	printf "  VBOOT_KEYS_PATH - Path to the vboot keys\n" >&2
-	printf "  VBOOT_TOOLS_PATH - Path to vboot tools\n" >&2
+	env printf '\n%s\n' 'Environment variables:' >&2
+	env printf '%s\n' '  KEYS_VERSION - Version to give the keys' >&2
+	env printf '%s\n' '  VBOOT_KEYS_PATH - Path to the vboot keys' >&2
+	env printf '%s\n' '  VBOOT_TOOLS_PATH - Path to vboot tools' >&2
 }
 
 keys_override_confirm() {
@@ -68,9 +68,9 @@ keys_override_confirm() {
 		return 0
 	fi
 
-	printf "This is going to override keys stored in the following directory:\n"
-	printf "  $VBOOT_KEYS_PATH\n"
-	printf "Press enter to confirm: "
+	env printf '%s\n' 'This is going to override keys stored in the following directory:'
+	env printf '%s\n' "  $VBOOT_KEYS_PATH"
+	env printf '%s' 'Press enter to confirm: '
 
 	read confirm
 }
@@ -89,8 +89,8 @@ generate() {
 
 	for key in $KEYS
 	do
-		algorithm=$( echo "$algorithms" | sed "s/$REGEXP/\1/g" )
-		algorithms=$( echo "$algorithms" | sed "s/$REGEXP/\2/g" )
+		algorithm=$( env printf '%s\n' "$algorithms" | sed "s/$REGEXP/\1/g" )
+		algorithms=$( env printf '%s\n' "$algorithms" | sed "s/$REGEXP/\2/g" )
 
 		key_length=$(( 1 << (10 + ($algorithm / 3)) ))
 
@@ -104,23 +104,23 @@ generate() {
 		rm -f "$VBOOT_KEYS_PATH/$key.$PEM" "$VBOOT_KEYS_PATH/$key.$CRT" "$VBOOT_KEYS_PATH/$key.$KEYB"
 	done
 
-	printf "\nGenerated keys $KEYS\n"
+	env printf '\n%s\n' "Generated keys $KEYS"
 
 	for keyblock in $KEYBLOCKS
 	do
-		pubkey=$( echo "$subkeys" | sed "s/$REGEXP/\1/g" )
-		subkeys=$( echo "$subkeys" | sed "s/$REGEXP/\2/g" )
-		privkey=$( echo "$subkeys" | sed "s/$REGEXP/\1/g" )
-		subkeys=$( echo "$subkeys" | sed "s/$REGEXP/\2/g" )
+		pubkey=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\1/g" )
+		subkeys=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\2/g" )
+		privkey=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\1/g" )
+		subkeys=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\2/g" )
 
-		mode=$( echo "$modes" | sed "s/$REGEXP/\1/g" )
-		modes=$( echo "$modes" | sed "s/$REGEXP/\2/g" )
+		mode=$( env printf '%s\n' "$modes" | sed "s/$REGEXP/\1/g" )
+		modes=$( env printf '%s\n' "$modes" | sed "s/$REGEXP/\2/g" )
 
 		futility vbutil_keyblock --pack "$VBOOT_KEYS_PATH/$keyblock.$KEYBLOCK" --flags "$mode" --datapubkey "$VBOOT_KEYS_PATH/$pubkey.$VBPUBK" --signprivate "$VBOOT_KEYS_PATH/$privkey.$VBPRIVK"
 		futility vbutil_keyblock --unpack "$VBOOT_KEYS_PATH/$keyblock.$KEYBLOCK" --signpubkey "$VBOOT_KEYS_PATH/$privkey.$VBPUBK"
 	done
 
-	printf "\nGenerated keyblocks $KEYBLOCKS\n"
+	env printf '\n%s\n' "Generated keyblocks $KEYBLOCKS"
 }
 
 verify() {
@@ -130,15 +130,15 @@ verify() {
 
 	for keyblock in $KEYBLOCKS
 	do
-		pubkey=$( echo "$subkeys" | sed "s/$REGEXP/\1/g" )
-		subkeys=$( echo "$subkeys" | sed "s/$REGEXP/\2/g" )
-		privkey=$( echo "$subkeys" | sed "s/$REGEXP/\1/g" )
-		subkeys=$( echo "$subkeys" | sed "s/$REGEXP/\2/g" )
+		pubkey=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\1/g" )
+		subkeys=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\2/g" )
+		privkey=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\1/g" )
+		subkeys=$( env printf '%s\n' "$subkeys" | sed "s/$REGEXP/\2/g" )
 
 		futility vbutil_keyblock --unpack "$VBOOT_KEYS_PATH/$keyblock.$KEYBLOCK" --signpubkey "$VBOOT_KEYS_PATH/$privkey.$VBPUBK"
 	done
 
-	printf "\nVerified keyblocks $KEYBLOCKS\n"
+	env printf '\n%s\n' "Verified keyblocks $KEYBLOCKS"
 }
 
 requirements() {
@@ -151,7 +151,7 @@ requirements() {
 
 		if [ -z "$requirement_path" ]
 		then
-			printf "Missing requirement: $requirement\n" >&2
+			env printf '%s\n' "Missing requirement: $requirement" >&2
 			exit 1
 		fi
 	done