From 6a16b70e0ef7fba37052a2b7b3ddb63e8fc9b32e Mon Sep 17 00:00:00 2001 From: Alexey Suhov Date: Fri, 2 Apr 2021 21:37:21 +0300 Subject: [PATCH] setupvars and demos: Fix getting script dir on macOS 10.15 with with default zsh shell (#5094) --- inference-engine/samples/build_samples.sh | 2 +- model-optimizer/install_prerequisites/install_prerequisites.sh | 2 +- scripts/demo/demo_benchmark_app.sh | 2 +- scripts/demo/demo_security_barrier_camera.sh | 2 +- scripts/demo/demo_squeezenet_download_convert_run.sh | 2 +- scripts/install_dependencies/install_NEO_OCL_driver.sh | 2 +- scripts/install_dependencies/install_openvino_dependencies.sh | 2 +- scripts/setupvars/setupvars.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inference-engine/samples/build_samples.sh b/inference-engine/samples/build_samples.sh index 91354e3913d..d584a110119 100755 --- a/inference-engine/samples/build_samples.sh +++ b/inference-engine/samples/build_samples.sh @@ -14,7 +14,7 @@ error() { } trap 'error ${LINENO}' ERR -SAMPLES_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SAMPLES_PATH="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" && pwd )" printf "\nSetting environment variables for building samples...\n" diff --git a/model-optimizer/install_prerequisites/install_prerequisites.sh b/model-optimizer/install_prerequisites/install_prerequisites.sh index 5ae1d9f8986..bd2deb23ae5 100755 --- a/model-optimizer/install_prerequisites/install_prerequisites.sh +++ b/model-optimizer/install_prerequisites/install_prerequisites.sh @@ -35,7 +35,7 @@ for ((i=1;i <= $#;i++)) { esac } -SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" && pwd )" if [[ -f /etc/centos-release ]]; then DISTRO="centos" diff --git a/scripts/demo/demo_benchmark_app.sh b/scripts/demo/demo_benchmark_app.sh index 5420a0d7bc1..8c84e8a724e 100755 --- a/scripts/demo/demo_benchmark_app.sh +++ b/scripts/demo/demo_benchmark_app.sh @@ -3,7 +3,7 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" && pwd )" . "$ROOT_DIR/utils.sh" diff --git a/scripts/demo/demo_security_barrier_camera.sh b/scripts/demo/demo_security_barrier_camera.sh index 5116cd4b7f1..4913aaf1d31 100755 --- a/scripts/demo/demo_security_barrier_camera.sh +++ b/scripts/demo/demo_security_barrier_camera.sh @@ -3,7 +3,7 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" && pwd )" . "$ROOT_DIR/utils.sh" diff --git a/scripts/demo/demo_squeezenet_download_convert_run.sh b/scripts/demo/demo_squeezenet_download_convert_run.sh index 0aa4ad64ef2..00daead548e 100755 --- a/scripts/demo/demo_squeezenet_download_convert_run.sh +++ b/scripts/demo/demo_squeezenet_download_convert_run.sh @@ -3,7 +3,7 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" && pwd )" . "$ROOT_DIR/utils.sh" diff --git a/scripts/install_dependencies/install_NEO_OCL_driver.sh b/scripts/install_dependencies/install_NEO_OCL_driver.sh index 81deadd3d8a..b9dfa1d71ed 100755 --- a/scripts/install_dependencies/install_NEO_OCL_driver.sh +++ b/scripts/install_dependencies/install_NEO_OCL_driver.sh @@ -19,7 +19,7 @@ CENTOS_MINOR= RHEL_VERSION= UBUNTU_VERSION= DISTRO= -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" >/dev/null 2>&1 && pwd )" INSTALL_DRIVER_VERSION='19.41.14441' AVAILABLE_DRIVERS=("19.41.14441" "20.35.17767") diff --git a/scripts/install_dependencies/install_openvino_dependencies.sh b/scripts/install_dependencies/install_openvino_dependencies.sh index 4b4a729c92f..802ecbd0fa9 100755 --- a/scripts/install_dependencies/install_openvino_dependencies.sh +++ b/scripts/install_dependencies/install_openvino_dependencies.sh @@ -59,7 +59,7 @@ if [ -n "$selftest" ] ; then echo "||" echo "|| Test $image / '$opt'" echo "||" - SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" >/dev/null 2>&1 && pwd )" docker run -it --rm \ --volume ${SCRIPT_DIR}:/scripts:ro,Z \ --volume yum-cache:/var/cache/yum \ diff --git a/scripts/setupvars/setupvars.sh b/scripts/setupvars/setupvars.sh index 958a3a00781..62f9b5f8ec8 100755 --- a/scripts/setupvars/setupvars.sh +++ b/scripts/setupvars/setupvars.sh @@ -3,7 +3,7 @@ # Copyright (C) 2018-2021 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" >/dev/null 2>&1 && pwd )" BASE_DIR="$( dirname "$SCRIPT_DIR" )" INSTALLDIR="${BASE_DIR}"