setupvars and demos: Fix getting script dir on macOS 10.15 with with default zsh shell (#5094)
This commit is contained in:
parent
ead6040b21
commit
6a16b70e0e
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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")
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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}"
|
||||
|
Loading…
Reference in New Issue
Block a user