From 284fbf8afb0ff784507e7b0f8b9d325e8644f67c Mon Sep 17 00:00:00 2001
From: Tomáš Levora <t.levora@partner.samsung.com>
Date: Tue, 23 Apr 2019 14:28:47 +0200
Subject: Fix download scripts to handle empty lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixing download and saving scripts to be able to ignore empty or 00D
ending lines in lists

Issue-ID: OOM-1818

Change-Id: I55ef1dfbea628f8c1d4b19745536e629a2dbe0c9
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
---
 build/creating_data/download-docker-images.sh | 34 ++++++++-------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

(limited to 'build/creating_data/download-docker-images.sh')

diff --git a/build/creating_data/download-docker-images.sh b/build/creating_data/download-docker-images.sh
index 121cd5af..c0a0bed1 100755
--- a/build/creating_data/download-docker-images.sh
+++ b/build/creating_data/download-docker-images.sh
@@ -19,35 +19,21 @@
 #   COPYRIGHT NOTICE ENDS HERE
 
 
-# boilerplate
-RELATIVE_PATH=../ # relative path from this script to 'common-functions.sh'
-if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then
-    SCRIPT_DIR=$(dirname "${0}")
-    LOCAL_PATH=$(readlink -f "$SCRIPT_DIR")
-    . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh
-fi
+# Load common-functions library
+. $(dirname ${0})/../common-functions.sh
 
-SRC_IMAGE_LIST=$1
-if [[ -z "$SRC_IMAGE_LIST" ]]; then
-    SRC_IMAGE_LIST="docker_image_list.txt"
+LIST_FILE="${1}"
+if [[ -z "$LIST_FILE" ]]; then
+    LIST_FILE="docker_image_list.txt"
 fi
 
 echo "Download all images"
 
-lines=$(cat $SRC_IMAGE_LIST | wc -l)
+lines=$(clean_list "$LIST_FILE" | wc -l)
 line=1
-while read -r image; do
+for image in $(clean_list "$LIST_FILE"); do
     echo "== pkg #$line of $lines =="
-
-    name=$(echo $image|awk '{print $1}')
-    digest=$(echo $image|awk '{print $2}')
-
-    echo "$name digest:$digest"
-    if [[ "$digest" == "<none>" ]]; then
-        retry docker -l error pull "$name"
-    else
-        retry docker -l error pull "$name"
-    fi
+    echo "$image"
+    retry docker -l error pull "$image"
     line=$((line+1))
-
-done < "$SRC_IMAGE_LIST"
+done
-- 
cgit 1.2.3-korg