From ffefb9d3393f443a6ce04fa1ff8631de11f195a6 Mon Sep 17 00:00:00 2001 From: Germain Haugou Date: Thu, 5 Mar 2020 14:18:42 +0100 Subject: [PATCH] Fix to get source files working with zsh --- configs/common.sh | 8 ++++++++ configs/marsellus.sh | 9 ++++++++- configs/pulp.sh | 9 ++++++++- configs/pulpissimo.sh | 9 ++++++++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/configs/common.sh b/configs/common.sh index 30f4b51..2e81460 100644 --- a/configs/common.sh +++ b/configs/common.sh @@ -1,6 +1,14 @@ #!/bin/bash -e +if [ -n "${ZSH_VERSION:-}" ]; then + DIR="$(readlink -f -- "${(%):-%x}")" + DIRNAME="$(dirname $DIR)" + scriptDir="$(dirname $DIRNAME)" +else + scriptDir="$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" +fi + export PULPRT_HOME=$scriptDir export PULP_SDK_HOME=$PULPRT_HOME \ No newline at end of file diff --git a/configs/marsellus.sh b/configs/marsellus.sh index e9e13e0..06c4c28 100644 --- a/configs/marsellus.sh +++ b/configs/marsellus.sh @@ -3,6 +3,13 @@ export PULPRT_TARGET=marsellus export PULPRUN_TARGET=marsellus -scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +if [ -n "${ZSH_VERSION:-}" ]; then + DIR="$(readlink -f -- "${(%):-%x}")" + scriptDir="$(dirname $DIR)" +else + + scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + +fi source $scriptDir/common.sh diff --git a/configs/pulp.sh b/configs/pulp.sh index d9c6746..ce3109b 100644 --- a/configs/pulp.sh +++ b/configs/pulp.sh @@ -3,6 +3,13 @@ export PULPRT_TARGET=pulp export PULPRUN_TARGET=pulp -scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +if [ -n "${ZSH_VERSION:-}" ]; then + DIR="$(readlink -f -- "${(%):-%x}")" + scriptDir="$(dirname $DIR)" +else + + scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + +fi source $scriptDir/common.sh diff --git a/configs/pulpissimo.sh b/configs/pulpissimo.sh index f395853..2882987 100644 --- a/configs/pulpissimo.sh +++ b/configs/pulpissimo.sh @@ -3,6 +3,13 @@ export PULPRT_TARGET=pulpissimo export PULPRUN_TARGET=pulpissimo -scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +if [ -n "${ZSH_VERSION:-}" ]; then + DIR="$(readlink -f -- "${(%):-%x}")" + scriptDir="$(dirname $DIR)" +else + + scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + +fi source $scriptDir/common.sh