From 6d62b7b9f8ebd18ab3a29a3036c891f1a55c7edc Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 2 Apr 2021 10:55:52 +0900 Subject: [PATCH] scripts: tizen: sd_fusing: Fix error only with -b option If there is only -b option without real binary name, there was error. Fix the error only with -b option. Change-Id: I4affff4ae5f567b81601727f33161251db2457c3 Signed-off-by: Seung-Woo Kim --- scripts/tizen/sd_fusing_rpi3.sh | 13 ++++++++----- scripts/tizen/sd_fusing_xu4.sh | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/tizen/sd_fusing_rpi3.sh b/scripts/tizen/sd_fusing_rpi3.sh index 103d217..bb21817 100755 --- a/scripts/tizen/sd_fusing_rpi3.sh +++ b/scripts/tizen/sd_fusing_rpi3.sh @@ -31,7 +31,7 @@ function get_index_use_name () { local -r binary_name=$1 for ((idx=0;idx<$PART_TABLE_ROW;idx++)); do - if [ ${PART_TABLE[idx * ${PART_TABLE_COL} + 0]} == $binary_name ]; then + if [ ${PART_TABLE[idx * ${PART_TABLE_COL} + 0]} == "$binary_name" ]; then return $idx fi done @@ -71,7 +71,7 @@ function fusing_image () { local -r fusing_img=$1 # get binary info using basename - get_index_use_name $(basename $fusing_img) + get_index_use_name $(basename "$fusing_img") local -r -i part_idx=$? if [ $part_idx -ne $PART_TABLE_ROW ];then @@ -370,7 +370,7 @@ function check_device () { function print_logo () { echo "" - echo "Raspberry Pi downloader, version 2.0.5" + echo "Raspberry Pi downloader, version 2.0.6" echo "" } @@ -378,9 +378,12 @@ print_logo function add_fusing_binary() { local declare binary_name=$1 - FUSING_BINARY_ARRAY[$FUSING_BINARY_NUM]=$binary_name - FUSING_BINARY_NUM=$((FUSING_BINARY_NUM + 1)) + if [ "$binary_name" != "" ]; then + FUSING_BINARY_ARRAY[$FUSING_BINARY_NUM]=$binary_name + + FUSING_BINARY_NUM=$((FUSING_BINARY_NUM + 1)) + fi } diff --git a/scripts/tizen/sd_fusing_xu4.sh b/scripts/tizen/sd_fusing_xu4.sh index aafc1fd..26872ee 100755 --- a/scripts/tizen/sd_fusing_xu4.sh +++ b/scripts/tizen/sd_fusing_xu4.sh @@ -34,7 +34,7 @@ function get_index_use_name () { local -r binary_name=$1 for ((idx=0;idx<$PART_TABLE_ROW;idx++)); do - if [ ${PART_TABLE[idx * ${PART_TABLE_COL} + 0]} == $binary_name ]; then + if [ ${PART_TABLE[idx * ${PART_TABLE_COL} + 0]} == "$binary_name" ]; then return $idx fi done @@ -119,7 +119,7 @@ function fusing_image () { local -r fusing_img=$1 # get binary info using basename - get_index_use_name $(basename $fusing_img) + get_index_use_name $(basename "$fusing_img") local -r -i part_idx=$? if [ $part_idx -ne $PART_TABLE_ROW ];then @@ -396,7 +396,7 @@ function check_device () { function print_logo () { echo "" - echo "[Odroid-XU3/4 downloader version 1.4.3]" + echo "[Odroid-XU3/4 downloader version 1.4.4]" echo "This version also supports Tizen 4.0." echo "" } @@ -405,9 +405,12 @@ print_logo function add_fusing_binary() { local declare binary_name=$1 - FUSING_BINARY_ARRAY[$FUSING_BINARY_NUM]=$binary_name - FUSING_BINARY_NUM=$((FUSING_BINARY_NUM + 1)) + if [ "$binary_name" != "" ]; then + FUSING_BINARY_ARRAY[$FUSING_BINARY_NUM]=$binary_name + + FUSING_BINARY_NUM=$((FUSING_BINARY_NUM + 1)) + fi } declare -i binary_option=0 -- 2.7.4