From: Samuli Silvius <s.silvius@partner.samsung.com>
Date: Thu, 20 Jun 2019 06:29:05 +0000 (+0300)
Subject: Unify resolving current directory in KUD scripts
X-Git-Tag: 0.5.0~56
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F90217%2F1;p=multicloud%2Fk8s.git

Unify resolving current directory in KUD scripts

Issue-ID: MULTICLOUD-685

Change-Id: I62199f64da360627a13c467139a39430ae389167
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
---

diff --git a/kud/ci/kud-installer.sh b/kud/ci/kud-installer.sh
index 9fdf5df6..73c1628b 100755
--- a/kud/ci/kud-installer.sh
+++ b/kud/ci/kud-installer.sh
@@ -8,6 +8,6 @@
 
 set -x -e -o pipefail
 
-curr_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+curr_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 cd ${curr_dir}/../hosting_providers/baremetal
 ./aio.sh
diff --git a/kud/hosting_providers/baremetal/aio.sh b/kud/hosting_providers/baremetal/aio.sh
index c9903cd3..c1aac6ac 100755
--- a/kud/hosting_providers/baremetal/aio.sh
+++ b/kud/hosting_providers/baremetal/aio.sh
@@ -12,7 +12,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-aio_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+aio_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 cd ${aio_dir}/../vagrant
 
 # For aio inventory by default get ovn central ip from local host default interface.
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index ca14bad7..f93839d2 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -12,7 +12,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-INSTALLER_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+INSTALLER_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 
 source ${INSTALLER_DIR}/../../tests/_functions.sh
 
diff --git a/kud/tests/_functions.sh b/kud/tests/_functions.sh
index 5e6314ce..a885bc50 100755
--- a/kud/tests/_functions.sh
+++ b/kud/tests/_functions.sh
@@ -12,7 +12,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-FUNCTIONS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+FUNCTIONS_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 
 source /etc/environment