aboutsummaryrefslogtreecommitdiff
path: root/projects/cros-scripts
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2017-10-25 23:11:15 -0400
committerAndrew Robbins <contact@andrewrobbins.info>2017-10-28 23:29:59 -0400
commit4e3505463eadffd9f1994f8ecaba9b1d693ec7bf (patch)
tree0d9f92579114c27a7d04c5116479ed1dcf8b317e /projects/cros-scripts
parentbedc62fdada9e0e7a67b82153b186689dda07145 (diff)
downloadlibrebootfr-4e3505463eadffd9f1994f8ecaba9b1d693ec7bf.tar.gz
librebootfr-4e3505463eadffd9f1994f8ecaba9b1d693ec7bf.zip
Modify fd copying in printf calls for readability
Diffstat (limited to 'projects/cros-scripts')
-rwxr-xr-xprojects/cros-scripts/install/cros-boot-keys18
-rwxr-xr-xprojects/cros-scripts/install/cros-firmware-prepare44
-rwxr-xr-xprojects/cros-scripts/install/cros-kernel-install28
-rwxr-xr-xprojects/cros-scripts/install/cros-kernel-prepare26
-rwxr-xr-xprojects/cros-scripts/install/cros-medium-setup22
5 files changed, 69 insertions, 69 deletions
diff --git a/projects/cros-scripts/install/cros-boot-keys b/projects/cros-scripts/install/cros-boot-keys
index 28b25175..53db579f 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 '%s\n' "$executable [action]" >&2
+ printf 1>&2 '%s\n' "$executable [action]"
- printf '\n%s\n' 'Actions:' >&2
- printf '%s\n' ' generate - Generate a set of keys' >&2
- printf '%s\n' ' verify - Verify keyblocks' >&2
+ printf 1>&2 '\n%s\n' 'Actions:'
+ printf 1>&2 '%s\n' ' generate - Generate a set of keys'
+ printf 1>&2 '%s\n' ' verify - Verify keyblocks'
- printf '\n%s\n' 'Environment variables:' >&2
- printf '%s\n' ' KEYS_VERSION - Version to give the keys' >&2
- printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2
- printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2
+ printf 1>&2 '\n%s\n' 'Environment variables:'
+ printf 1>&2 '%s\n' ' KEYS_VERSION - Version to give the keys'
+ printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys'
+ printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools'
}
keys_override_confirm() {
@@ -151,7 +151,7 @@ requirements() {
if [ -z "$requirement_path" ]
then
- printf '%s\n' "Missing requirement: $requirement" >&2
+ printf 1>&2 '%s\n' "Missing requirement: $requirement"
exit 1
fi
done
diff --git a/projects/cros-scripts/install/cros-firmware-prepare b/projects/cros-scripts/install/cros-firmware-prepare
index 52deadf5..8fceffb4 100755
--- a/projects/cros-scripts/install/cros-firmware-prepare
+++ b/projects/cros-scripts/install/cros-firmware-prepare
@@ -22,34 +22,34 @@ VBPUBK="vbpubk"
GBB_FLAGS="dev_screen_short_delay load_option_roms enable_alternate_os force_dev_switch_on force_dev_boot_usb disable_fw_rollback_check enter_triggers_tonorm force_dev_boot_legacy faft_key_overide disable_ec_software_sync default_dev_boot_lefacy disable_pd_software_sync disable_lid_shutdown dev_boot_fastboot_full_cap enable_serial"
usage() {
- printf '%s\n' "$executable [action] [firmware image] [gbb action|vpd action] [gbb file|gbb flag|vpd file]" >&2
+ printf 1>&2 '%s\n' "$executable [action] [firmware image] [gbb action|vpd action] [gbb file|gbb flag|vpd file]"
- printf '\n%s\n' 'Actions:' >&2
- printf '%s\n' ' sign - Sign firmware image' >&2
- printf '%s\n' ' verify - Verify firmware image' >&2
- printf '%s\n' ' gbb - Google Binary Block' >&2
+ printf 1>&2 '\n%s\n' 'Actions:'
+ printf 1>&2 '%s\n' ' sign - Sign firmware image'
+ printf 1>&2 '%s\n' ' verify - Verify firmware image'
+ printf 1>&2 '%s\n' ' gbb - Google Binary Block'
- printf '\n%s\n' 'GBB actions:' >&2
- printf '%s\n' ' extract - Extract GBB from firmware image to path' >&2
- printf '%s\n' ' replace - Replace GBB from path to firmware image' >&2
- printf '%s\n' ' list - List enabled GBB flags' >&2
- printf '%s\n' ' enable - Enable GBB flag' >&2
- printf '%s\n' ' disable - Disable GBB flag' >&2
+ printf 1>&2 '\n%s\n' 'GBB actions:'
+ printf 1>&2 '%s\n' ' extract - Extract GBB from firmware image to path'
+ printf 1>&2 '%s\n' ' replace - Replace GBB from path to firmware image'
+ printf 1>&2 '%s\n' ' list - List enabled GBB flags'
+ printf 1>&2 '%s\n' ' enable - Enable GBB flag'
+ printf 1>&2 '%s\n' ' disable - Disable GBB flag'
- printf '\n%s\n' 'GBB flags:' >&2
+ printf 1>&2 '\n%s\n' 'GBB flags:'
for flag in $GBB_FLAGS
do
- printf '%s\n' " $flag" >&2
+ printf 1>&2 '%s\n' " $flag"
done
- printf '\n%s\n' 'VPD actions:' >&2
- printf '%s\n' ' extract - Extract VPD from firmware image to path' >&2
- printf '%s\n' ' replace - Replace VPD from path to firmware image' >&2
+ printf 1>&2 '\n%s\n' 'VPD actions:'
+ printf 1>&2 '%s\n' ' extract - Extract VPD from firmware image to path'
+ printf 1>&2 '%s\n' ' replace - Replace VPD from path to firmware image'
- printf '\n%s\n' 'Environment variables:' >&2
- printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2
- printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2
+ printf 1>&2 '\n%s\n' 'Environment variables:'
+ printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys'
+ printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools'
}
sign() {
@@ -134,7 +134,7 @@ gbb() {
if [ -z "$flag_value" ]
then
- printf '%s\n' "Invalid GBB flag: $gbb_flag" >&2
+ printf 1>&2 '%s\n' "Invalid GBB flag: $gbb_flag"
exit 1
fi
@@ -156,7 +156,7 @@ gbb() {
if [ -z "$flag_value" ]
then
- printf '%s\n' "Invalid GBB flag: $gbb_flag" >&2
+ printf 1>&2 '%s\n' "Invalid GBB flag: $gbb_flag"
exit 1
fi
@@ -237,7 +237,7 @@ requirements() {
if [ -z "$requirement_path" ]
then
- printf '%s\n' "Missing requirement: $requirement" >&2
+ printf 1>&2 '%s\n' "Missing requirement: $requirement"
exit 1
fi
done
diff --git a/projects/cros-scripts/install/cros-kernel-install b/projects/cros-scripts/install/cros-kernel-install
index 7333b3fa..8f6c69e9 100755
--- a/projects/cros-scripts/install/cros-kernel-install
+++ b/projects/cros-scripts/install/cros-kernel-install
@@ -23,22 +23,22 @@ MODEL="model"
NAME="name"
usage() {
- printf '%s\n' "$executable [action] [storage] [kernel image|kernel modules]" >&2
+ printf 1>&2 '%s\n' "$executable [action] [storage] [kernel image|kernel modules]"
- printf '\n%s\n' 'Actions:' >&2
- printf '%s\n' ' backup - Backup kernel image' >&2
- printf '%s\n' ' image - Install kernel image' >&2
- printf '%s\n' ' modules - Install kernel modules' >&2
+ printf 1>&2 '\n%s\n' 'Actions:'
+ printf 1>&2 '%s\n' ' backup - Backup kernel image'
+ printf 1>&2 '%s\n' ' image - Install kernel image'
+ printf 1>&2 '%s\n' ' modules - Install kernel modules'
usage_storage
- printf '\n%s\n' 'Environment variables:' >&2
- printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2
- printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2
+ printf 1>&2 '\n%s\n' 'Environment variables:'
+ printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys'
+ printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools'
}
usage_storage() {
- printf '\n%s\n' 'Storage:' >&2
+ printf 1>&2 '\n%s\n' 'Storage:'
local nodes=$( ls "$SYS_BLOCK_PATH" )
local node_path
@@ -58,7 +58,7 @@ usage_storage() {
continue
fi
- printf '%s\n' " $node_path - $name" >&2
+ printf 1>&2 '%s\n' " $node_path - $name"
done
}
@@ -155,7 +155,7 @@ backup() {
if [ -z "$storage_kernel_path" ]
then
- printf '%s\n' "No kernel partition found on storage $storage_path" >&2
+ printf 1>&2 '%s\n' "No kernel partition found on storage $storage_path"
return 1
fi
@@ -172,7 +172,7 @@ image() {
if [ -z "$storage_kernel_path" ]
then
- printf '%s\n' "No kernel partition found on storage $storage_path" >&2
+ printf 1>&2 '%s\n' "No kernel partition found on storage $storage_path"
return 1
fi
@@ -192,7 +192,7 @@ modules() {
if [ -z "$storage_rootfs_path" ]
then
- printf '%s\n' "No rootfs partition found on storage $storage_path" >&2
+ printf 1>&2 '%s\n' "No rootfs partition found on storage $storage_path"
return 1
fi
@@ -221,7 +221,7 @@ requirements() {
if [ -z "$requirement_path" ]
then
- printf '%s\n' "Missing requirement: $requirement" >&2
+ printf 1>&2 '%s\n' "Missing requirement: $requirement"
exit 1
fi
done
diff --git a/projects/cros-scripts/install/cros-kernel-prepare b/projects/cros-scripts/install/cros-kernel-prepare
index 047bb5c1..8dd5c797 100755
--- a/projects/cros-scripts/install/cros-kernel-prepare
+++ b/projects/cros-scripts/install/cros-kernel-prepare
@@ -27,21 +27,21 @@ FIT="fit"
IMG="img"
usage() {
- printf '%s\n' "$executable [action] [kernel files|kernel image] [medium]" >&2
+ printf 1>&2 '%s\n' "$executable [action] [kernel files|kernel image] [medium]"
- printf '\n%s\n' 'Actions:' >&2
- printf '%s\n' ' pack - Pack kernel files to a medium-specific image' >&2
- printf '%s\n' ' sign - Sign kernel image' >&2
- printf '%s\n' ' verify - Very kernel image signatures' >&2
+ printf 1>&2 '\n%s\n' 'Actions:'
+ printf 1>&2 '%s\n' ' pack - Pack kernel files to a medium-specific image'
+ printf 1>&2 '%s\n' ' sign - Sign kernel image'
+ printf 1>&2 '%s\n' ' verify - Very kernel image signatures'
- printf '\n%s\n' 'Medium:' >&2
- printf '%s\n' ' usb - External USB storage' >&2
- printf '%s\n' ' mmc - External SD card storage' >&2
- printf '%s\n' ' emmc - Internal storage' >&2
+ printf 1>&2 '\n%s\n' 'Medium:'
+ printf 1>&2 '%s\n' ' usb - External USB storage'
+ printf 1>&2 '%s\n' ' mmc - External SD card storage'
+ printf 1>&2 '%s\n' ' emmc - Internal storage'
- printf '\n%s\n' 'Environment variables:' >&2
- printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2
- printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2
+ printf 1>&2 '\n%s\n' 'Environment variables:'
+ printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys'
+ printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools'
}
pack() {
@@ -88,7 +88,7 @@ requirements() {
if [ -z "$requirement_path" ]
then
- printf '%s\n' "Missing requirement: $requirement" >&2
+ printf 1>&2 '%s\n' "Missing requirement: $requirement"
exit 1
fi
done
diff --git a/projects/cros-scripts/install/cros-medium-setup b/projects/cros-scripts/install/cros-medium-setup
index 2b278a9d..6295e0ec 100755
--- a/projects/cros-scripts/install/cros-medium-setup
+++ b/projects/cros-scripts/install/cros-medium-setup
@@ -32,22 +32,22 @@ GPT_SIZE=34
KERNEL_SIZE=16384
usage() {
- printf '%s\n' "$executable [action] [storage] [rootfs tarball|kernel files] [medium]" >&2
+ printf 1>&2 '%s\n' "$executable [action] [storage] [rootfs tarball|kernel files] [medium]"
- printf '\n%s\n' 'Actions:' >&2
- printf '%s\n' ' partitions - Setup partitions on storage' >&2
- printf '%s\n' ' rootfs - Install rootfs tarball to storage' >&2
- printf '%s\n' ' kernel - Install kernel files to storage' >&2
+ printf 1>&2 '\n%s\n' 'Actions:'
+ printf 1>&2 '%s\n' ' partitions - Setup partitions on storage'
+ printf 1>&2 '%s\n' ' rootfs - Install rootfs tarball to storage'
+ printf 1>&2 '%s\n' ' kernel - Install kernel files to storage'
usage_storage
- printf '\n%s\n' 'Environment variables:' >&2
- printf '%s\n' ' KERNEL_PATH - Path to the kernel image' >&2
- printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2
+ printf 1>&2 '\n%s\n' 'Environment variables:'
+ printf 1>&2 '%s\n' ' KERNEL_PATH - Path to the kernel image'
+ printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools'
}
usage_storage() {
- printf '\n%s\n' 'Storage:' >&2
+ printf 1>&2 '\n%s\n' 'Storage:'
local nodes=$( ls "$SYS_BLOCK_PATH" )
local node_path
@@ -67,7 +67,7 @@ usage_storage() {
continue
fi
- printf '%s\n' " $node_path - $name" >&2
+ printf 1>&2 '%s\n' " $node_path - $name"
done
}
@@ -243,7 +243,7 @@ requirements() {
if [ -z "$requirement_path" ]
then
- printf '%s\n' "Missing requirement: $requirement" >&2
+ printf 1>&2 '%s\n' "Missing requirement: $requirement"
exit 1
fi
done