brillo_update_payload: Clean up arguments in calls to delta_generator
This commit normalizes using -- instead of a mix of - and -- prefixes to
delta_generator invocations. delta_generator accepts both.
BUG=chromium:862679
TEST=ran commands
Change-Id: I5688e8dc11b6d120ae785ebab76dac9f306b845c
Reviewed-on: https://chromium-review.googlesource.com/1133706
Commit-Ready: Tudor Brindus <[email protected]>
Tested-by: Tudor Brindus <[email protected]>
Reviewed-by: Amin Hassani <[email protected]>
Reviewed-by: Mike Frysinger <[email protected]>
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index fdcc1e8..b256b36 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -559,7 +559,7 @@
echo "Generating ${payload_type} update."
# Common payload args:
- GENERATOR_ARGS=( -out_file="${FLAGS_payload}" )
+ GENERATOR_ARGS=( --out_file="${FLAGS_payload}" )
local part old_partitions="" new_partitions="" partition_names=""
local old_mapfiles="" new_mapfiles=""
@@ -580,16 +580,16 @@
# Target image args:
GENERATOR_ARGS+=(
- -partition_names="${partition_names}"
- -new_partitions="${new_partitions}"
- -new_mapfiles="${new_mapfiles}"
+ --partition_names="${partition_names}"
+ --new_partitions="${new_partitions}"
+ --new_mapfiles="${new_mapfiles}"
)
if [[ "${payload_type}" == "delta" ]]; then
# Source image args:
GENERATOR_ARGS+=(
- -old_partitions="${old_partitions}"
- -old_mapfiles="${old_mapfiles}"
+ --old_partitions="${old_partitions}"
+ --old_mapfiles="${old_mapfiles}"
)
if [[ -n "${FORCE_MINOR_VERSION}" ]]; then
GENERATOR_ARGS+=( --minor_version="${FORCE_MINOR_VERSION}" )
@@ -633,10 +633,10 @@
cmd_hash() {
"${GENERATOR}" \
- -in_file="${FLAGS_unsigned_payload}" \
- -signature_size="${FLAGS_signature_size}" \
- -out_hash_file="${FLAGS_payload_hash_file}" \
- -out_metadata_hash_file="${FLAGS_metadata_hash_file}"
+ --in_file="${FLAGS_unsigned_payload}" \
+ --signature_size="${FLAGS_signature_size}" \
+ --out_hash_file="${FLAGS_payload_hash_file}" \
+ --out_metadata_hash_file="${FLAGS_metadata_hash_file}"
echo "Done generating hash."
}
@@ -663,11 +663,11 @@
cmd_sign() {
GENERATOR_ARGS=(
- -in_file="${FLAGS_unsigned_payload}"
- -signature_size="${FLAGS_signature_size}"
- -payload_signature_file="${FLAGS_payload_signature_file}"
- -metadata_signature_file="${FLAGS_metadata_signature_file}"
- -out_file="${FLAGS_payload}"
+ --in_file="${FLAGS_unsigned_payload}"
+ --signature_size="${FLAGS_signature_size}"
+ --payload_signature_file="${FLAGS_payload_signature_file}"
+ --metadata_signature_file="${FLAGS_metadata_signature_file}"
+ --out_file="${FLAGS_payload}"
)
if [[ -n "${FLAGS_metadata_size_file}" ]]; then
@@ -688,8 +688,8 @@
cmd_properties() {
"${GENERATOR}" \
- -in_file="${FLAGS_payload}" \
- -properties_file="${FLAGS_properties_file}"
+ --in_file="${FLAGS_payload}" \
+ --properties_file="${FLAGS_properties_file}"
}
validate_verify_and_check() {
@@ -717,7 +717,7 @@
echo "Verifying ${payload_type} update."
# Common payload args:
- GENERATOR_ARGS=( -in_file="${FLAGS_payload}" )
+ GENERATOR_ARGS=( --in_file="${FLAGS_payload}" )
local part old_partitions="" new_partitions="" partition_names=""
for part in "${PARTITIONS_ORDER[@]}"; do
@@ -733,14 +733,14 @@
# Target image args:
GENERATOR_ARGS+=(
- -partition_names="${partition_names}"
- -new_partitions="${new_partitions}"
+ --partition_names="${partition_names}"
+ --new_partitions="${new_partitions}"
)
if [[ "${payload_type}" == "delta" ]]; then
# Source image args:
GENERATOR_ARGS+=(
- -old_partitions="${old_partitions}"
+ --old_partitions="${old_partitions}"
)
fi
