diff options
author | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-06-20 09:29:05 +0300 |
---|---|---|
committer | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-06-20 09:29:05 +0300 |
commit | 2860cd0ee42a205ea3c565c9953ff15bd79fcc25 (patch) | |
tree | 67e62de697ffb18fa1cd50c87a227ee1305bf653 | |
parent | 76acfa887ed36697e2ddff52f2fc84ee3fcf6c72 (diff) |
Unify resolving current directory in KUD scripts
Issue-ID: MULTICLOUD-685
Change-Id: I62199f64da360627a13c467139a39430ae389167
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
-rwxr-xr-x | kud/ci/kud-installer.sh | 2 | ||||
-rwxr-xr-x | kud/hosting_providers/baremetal/aio.sh | 2 | ||||
-rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 2 | ||||
-rwxr-xr-x | kud/tests/_functions.sh | 2 |
4 files changed, 4 insertions, 4 deletions
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 |