From cab6f0c139037a806d7c2e9d3125e27ef1be5fa6 Mon Sep 17 00:00:00 2001 From: Guillaume Endignoux <guillaumee@google.com> Date: Thu, 6 Feb 2020 15:52:13 +0100 Subject: [PATCH] Add a comma_separated function to avoid duplicated code. --- deploy.sh | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/deploy.sh b/deploy.sh index e02fb38..ca7a677 100755 --- a/deploy.sh +++ b/deploy.sh @@ -148,15 +148,19 @@ build_app_padding () { ) | xxd -p -r > "${tab_folder}/padding.bin" } -build_app () { +comma_separated () { # Flatten the array # This is equivalent to the following python snippet: ' '.join(arr).replace(' ', ',') - local feature_list=$(IFS=$'\n'; echo "$@") - if [ "X${feature_list}" != "X" ] + local list=$(IFS=$'\n'; echo "$@") + if [ "X${list}" != "X" ] then - feature_list="${feature_list// /,}" + feature_list="${list// /,}" fi + echo ${list} +} +build_app () { + local feature_list="$(comma_separated $@)" cargo build \ --release \ --target=thumbv7em-none-eabi \ @@ -176,14 +180,7 @@ build_app () { } build_crypto_bench () { - # Flatten the array - # This is equivalent to the following python snippet: ' '.join(arr).replace(' ', ',') - local feature_list=$(IFS=$'\n'; echo "$@") - if [ "X${feature_list}" != "X" ] - then - feature_list="${feature_list// /,}" - fi - + local feature_list="$(comma_separated $@)" cargo build \ --release \ --target=thumbv7em-none-eabi \ -- GitLab