From 479673b22bb6878e743682d172b058ec38d1f1a9 Mon Sep 17 00:00:00 2001
From: Tomáš Levora <t.levora@partner.samsung.com>
Date: Wed, 6 Nov 2019 11:49:52 +0100
Subject: Adding relative path support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding support for relative paths for all files and dirs provided as
parameters to build_nexus_blob.sh

Issue-ID: OOM-1927

Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
Change-Id: I18481508d91b9d432889215605fce51c3c6d7c82
---
 build/build_nexus_blob.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'build')

diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index 72dda540..688410ef 100755
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -212,32 +212,33 @@ push_docker () {
 while [ "${1}" != "" ]; do
     case ${1} in
         -d | --docker )                    shift
-                                           NXS_DOCKER_IMG_LISTS+=("${1}")
+                                           NXS_DOCKER_IMG_LISTS+=("$(realpath ${1})")
                                            ;;
         -i | --input-directory )           shift
-                                           DATA_DIR="${1}"
+                                           DATA_DIR="$(realpath ${1})"
                                            ;;
         -ld | --load-docker-images )       DOCKER_LOAD="true"
                                            ;;
         -n | --npm )                       NPM_PUSH="true"
                                            COMMANDS+=(expect npm)
                                            shift
-                                           NXS_NPM_LISTS+=("${1}")
+                                           NXS_NPM_LISTS+=("$(realpath ${1})")
                                            ;;
         -o | --output-directory )          shift
-                                           NEXUS_DATA_DIR="${1}"
+                                           NEXUS_DATA_DIR="$(realpath ${1})"
                                            ;;
         -p | --pypi )                      PYPI_PUSH="true"
                                            COMMANDS+=(twine)
                                            shift
-                                           NXS_PYPI_LISTS+=("${1}")
+                                           NXS_PYPI_LISTS+=("$(realpath ${1})")
                                            ;;
         -rl | --resource-list-directory )  shift
-                                           LISTS_DIR="${1}"
+                                           LISTS_DIR="$(realpath ${1})"
                                            ;;
         -h | --help )                      usage
                                            ;;
         *)                                 usage
+                                           ;;
     esac
     shift
 done
@@ -445,4 +446,4 @@ if [ -f ~/.docker/${DOCKER_CONF_BACKUP} ]; then
 fi
 
 echo "Nexus blob is built"
-exit 0
\ No newline at end of file
+exit 0
-- 
cgit