From ee9fae8341fb06a7d43a6a219878cd69ece86f0a Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Apr 2023 16:32:21 -0600 Subject: [PATCH] Revert "refactored: avoid using if statements" Refactoring this, caused unexpected issues. This reverts commit f72e00bbe9e3ab4da2d8e007480a603ce2f76439. --- ishare2 | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/ishare2 b/ishare2 index 7cd0c17..f5cc8ff 100755 --- a/ishare2 +++ b/ishare2 @@ -2006,18 +2006,33 @@ function corrections_for_qemu_images() { } function count_elements_to_download_for_qemu_images() { - FILES_COUNTER=0 - myArray=() + FILES_COUNTER=1 + myArray=("$FILE1LINK") - for i in {1..6}; do - filename_var="FILE${i}NAME" - link_var="FILE${i}LINK" + if ! [[ "$FILE2NAME" == *"-"* ]]; then + FILES_COUNTER=2 + myArray=("$FILE1LINK" "$FILE2LINK") + fi - if [[ -n "${!filename_var}" ]] && ! [[ "${!filename_var}" == *"-"* ]]; then - FILES_COUNTER=$((FILES_COUNTER + 1)) - myArray+=("${!link_var}") - fi - done + if ! [[ "$FILE3NAME" == *"-"* ]]; then + FILES_COUNTER=3 + myArray=("$FILE1LINK" "$FILE2LINK" "$FILE3LINK") + fi + + if ! [[ "$FILE4NAME" == *"-" ]]; then + FILES_COUNTER=4 + myArray=("$FILE1LINK" "$FILE2LINK" "$FILE3LINK" "$FILE4LINK") + fi + + if ! [[ "$FILE5NAME" == *"-"* ]]; then + FILES_COUNTER=5 + myArray=("$FILE1LINK" "$FILE2LINK" "$FILE3LINK" "$FILE4LINK" "$FILE5LINK") + fi + + if ! [[ "$FILE6NAME" == *"-"* ]]; then + FILES_COUNTER=6 + myArray=("$FILE1LINK" "$FILE2LINK" "$FILE3LINK" "$FILE4LINK" "$FILE5LINK" "$FILE6LINK") + fi } function corrections_for_dynamips_images() {