diff options
| author | Andrew Robbins <contact@andrewrobbins.info> | 2017-06-22 11:44:19 -0400 |
|---|---|---|
| committer | Andrew Robbins <contact@andrewrobbins.info> | 2017-06-23 09:25:42 -0400 |
| commit | 46c6ca3b9ee3e545a41b3b0f488885b20a1c65b5 (patch) | |
| tree | aa647a35566e714faa801f66a711ebb6f0da34f3 /tools/boot-keys | |
| parent | 7c8e518c62c6bbe6cd2b465099c561d8d53d38e9 (diff) | |
| download | librebootfr-46c6ca3b9ee3e545a41b3b0f488885b20a1c65b5.tar.gz librebootfr-46c6ca3b9ee3e545a41b3b0f488885b20a1c65b5.zip | |
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.
Diffstat (limited to 'tools/boot-keys')
| -rwxr-xr-x | tools/boot-keys/boot-keys | 10 | ||||
| -rwxr-xr-x | tools/boot-keys/boot-keys-helper | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/boot-keys/boot-keys b/tools/boot-keys/boot-keys index c446bd44..c79bac2b 100755 --- a/tools/boot-keys/boot-keys +++ b/tools/boot-keys/boot-keys @@ -24,7 +24,7 @@ generate() { if [ -z "$type" ] then - printf "Unable to determine keys type\n" >&2 + env printf '%s\n' 'Unable to determine keys type' >&2 return 1 fi @@ -47,11 +47,11 @@ sign() { if [ -z "$type" ] then - printf "Unable to determine keys type\n" >&2 + env printf '%s\n' 'Unable to determine keys type' >&2 return 1 fi - echo "$prepare_files" | while read install_path + env printf '%s\n' "$prepare_files" | while read install_path do case $type in "cros-firmware") @@ -90,11 +90,11 @@ verify() { if [ -z "$type" ] then - printf "Unable to determine keys type\n" >&2 + env printf '%s\n' 'Unable to determine keys type' >&2 return 1 fi - echo "$prepare_files" | while read install_path + env printf '%s\n' "$prepare_files" | while read install_path do case $type in "cros-firmware") diff --git a/tools/boot-keys/boot-keys-helper b/tools/boot-keys/boot-keys-helper index 5046cbfb..05739bbe 100755 --- a/tools/boot-keys/boot-keys-helper +++ b/tools/boot-keys/boot-keys-helper @@ -15,7 +15,7 @@ boot_keys_cros() { if ! [ -x "$cros_script_path" ] then - printf "$cros_script script missing from cros-scripts install" >&2 + env printf '%s' "$cros_script script missing from cros-scripts install" >&2 return 1 fi @@ -45,7 +45,7 @@ boot_keys_files_install_path() { ifs_save=$IFS IFS=$'\n' - for argument in $( echo "$helper_arguments" ) + for argument in $( env printf '%s\n' "$helper_arguments" ) do ( IFS=$ifs_save |