Normalize on cd+dirname+pwd for resolving paths

Signed-off-by: Jose A. Rivera <[email protected]>

deploy/gk-deploy

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 PROG="$(basename "${0}")"
-SCRIPT_DIR="$(dirname "${0}")"
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 TOPOLOGY='topology.json'
 LOG_FILE=''
 VERBOSE=0

tests/complex/lib.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # honor variables set from the caller:
-: "${TEST_DIR="$(dirname "${0}")"}"
+: "${TEST_DIR="$(cd "$(dirname "${0}")" && pwd)"}"
 : "${BASE_DIR="${TEST_DIR}/../.."}"
 : "${VAGRANT_DIR="${BASE_DIR}/vagrant"}"
 : "${DEPLOY_DIR="${BASE_DIR}/deploy"}"

tests/complex/run.sh

@@ -2,7 +2,7 @@
 
 # shellcheck disable=SC2034
 TESTNAME=""
-TEST_DIR="$(dirname "${0}")"
+TEST_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 source "${TEST_DIR}/lib.sh"
 

tests/complex/test-dynamic-provisioning.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_DIR="$(dirname "${0}")"
+TEST_DIR="$(cd "$(dirname "${0}")" && pwd)"
 DOCKER_IMAGE="gcr.io/google_containers/nginx-slim:0.8"
 
 source "${TEST_DIR}/lib.sh"

tests/complex/test-gk-deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_DIR="$(dirname "${0}")"
+TEST_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 source "${TEST_DIR}/lib.sh"
 

tests/complex/test-setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_DIR="$(dirname "${0}")"
+TEST_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 source "${TEST_DIR}/lib.sh"
 

tests/complex/test-teardown.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_DIR="$(dirname "${0}")"
+TEST_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 source "${TEST_DIR}/lib.sh"
 

tests/simple/gk-deploy/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$(dirname "${0}")"
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 echo "running tests in ${SCRIPT_DIR}"
 

tests/simple/gk-deploy/test_gk_deploy_basic.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$(dirname "${0}")"
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 STUBS_DIR="${SCRIPT_DIR}/stubs"
 TESTS_DIR="${SCRIPT_DIR}/.."
 INC_DIR="${TESTS_DIR}/common"

tests/simple/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$(dirname "${0}")"
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 failed=0
 

tests/simple/shell/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR=$(cd "$(dirname "${0}")" || exit 1; pwd)
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 echo "running tests in ${SCRIPT_DIR}"
 

tests/simple/shell/test_realpath.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR=$(cd "$(dirname "${0}")" || exit 1; pwd)
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 TESTS_DIR="${SCRIPT_DIR}/.."
 INC_DIR="${TESTS_DIR}/common"
 BASE_DIR="${SCRIPT_DIR}/../../.."

tests/simple/shell/test_syntax.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR=$(cd "$(dirname "${0}")" || exit 1; pwd)
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 TESTS_DIR="${SCRIPT_DIR}/.."
 INC_DIR="${TESTS_DIR}/common"
 BASE_DIR="${SCRIPT_DIR}/../../.."

tests/simple/yaml/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$(dirname "${0}")"
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 
 echo "running tests in ${SCRIPT_DIR}"
 

tests/simple/yaml/test_syntax.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$(dirname "${0}")"
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 TESTS_DIR="${SCRIPT_DIR}/.."
 INC_DIR="${TESTS_DIR}/common"
 BASE_DIR="${SCRIPT_DIR}/../../.."

vagrant/demo/demo-deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEMO_DIR="$(dirname "${0}")"
+DEMO_DIR="$(cd "$(dirname "${0}")" && pwd)"
 VAGRANT_DIR="${DEMO_DIR}/.."
 
 . "${DEMO_DIR}/util.sh"

vagrant/demo/demo-dynamic-provisioning.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEMO_DIR="$(dirname "${0}")"
+DEMO_DIR="$(cd "$(dirname "${0}")" && pwd)"
 VAGRANT_DIR="${DEMO_DIR}/.."
 
 cd "${VAGRANT_DIR}" || exit 1

vagrant/demo/demo-inside-wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEMO_DIR="$(dirname "${0}")"
+DEMO_DIR="$(cd "$(dirname "${0}")" && pwd)"
 VAGRANT_DIR="${DEMO_DIR}/.."
 SSH_CONFIG=${DEMO_DIR}/ssh-config
 

vagrant/demo/demo-prepare.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEMO_DIR="$(dirname "${0}")"
+DEMO_DIR="$(cd "$(dirname "${0}")" && pwd)"
 VAGRANT_DIR="${DEMO_DIR}/.."
 DEPLOY_DIR="${VAGRANT_DIR}/../deploy"
 SSH_CONFIG="${DEMO_DIR}/ssh-config"

vagrant/demo/demo-status.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEMO_DIR="$(dirname "${0}")"
+DEMO_DIR="$(cd "$(dirname "${0}")" && pwd)"
 VAGRANT_DIR="${DEMO_DIR}/.."
 
 cd "${VAGRANT_DIR}" || exit 1

vagrant/demo/demo-test-heketi.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEMO_DIR="$(dirname "${0}")"
+DEMO_DIR="$(cd "$(dirname "${0}")" && pwd)"
 VAGRANT_DIR="${DEMO_DIR}/.."
 
 cd "${VAGRANT_DIR}" || exit 1