X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Faglsetup.sh;h=e7b4b1909046fb1539fd50567f1004b711d2b2ef;hb=refs%2Ftags%2Fflounder_6.0.4;hp=b11a54196e4d7889936b9c74496d8c90641c8b02;hpb=24c89f22961bab9a995ab9c18881a3109a1c8109;p=AGL%2Fmeta-agl.git diff --git a/scripts/aglsetup.sh b/scripts/aglsetup.sh index b11a54196..e7b4b1909 100644 --- a/scripts/aglsetup.sh +++ b/scripts/aglsetup.sh @@ -27,11 +27,11 @@ # detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594 SOURCED=0 if [ -n "$ZSH_EVAL_CONTEXT" ]; then - [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); } + [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) > /dev/null && pwd -P); } elif [ -n "$KSH_VERSION" ]; then - [[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); } + [[ "$(cd $(dirname -- $0) > /dev/null && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) > /dev/null && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) > /dev/null && pwd -P); } elif [ -n "$BASH_VERSION" ]; then - [[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); } + [[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) > /dev/null && pwd -P); } fi if [ $SOURCED -ne 1 ]; then