diff options
| author |   Henrique Ferreiro <hferreiro@igalia.com> | 2018-11-23 01:40:32 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-11-23 19:16:16 +0000 |
| commit | cae7cfb01c4e39a33ef3e851851632b4f0fd5db4 (patch) | |
| tree | d34d2c5ef123455d66f640ab5ed18d584984c10d /scripts | |
| parent | 803f03daebb58b3a26462df35f001637f2ddf9a0 (diff) | |
Fix SOURCEDIR, BUILDDIR and similar when `cd` prints to stdout
Several variables containing directories in `aglsetup.sh` and other
scripts use the common one-liner "cd $DIR && pwd -P" to resolve
symlinks. Unfortunately, in some cases, `cd` writes the new directory to
stdout, e.g. when using multiple search paths. This commit changes the
above to "cd $DIR > /dev/null && pwd -P" to make it more robust.
Change-Id: I150ecc9940d88738cf17add68290c35486a81a3b
Signed-off-by: Henrique Ferreiro <hferreiro@igalia.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/.aglsetup_genconfig.bash | 8 | ||||
| -rw-r--r-- | scripts/aglsetup.sh | 6 | ||||
| -rw-r--r-- | scripts/envsetup.sh | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index d4f3ba813..b2471a71c 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -39,8 +39,8 @@ DEBUG=0 #SCRIPT=$(basename $BASH_SOURCE) SCRIPT=aglsetup.sh -SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P) -METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P) +SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) > /dev/null && pwd -P) +METADIR=$(cd $(dirname $BASH_SOURCE)/../.. > /dev/null && pwd -P) function info() { echo "$@" >&2; } function infon() { echo -n "$@" >&2; } @@ -342,7 +342,7 @@ done # validate build dir debug "validating builddir $BUILDDIR" -BUILDDIR=$(mkdir -p "$BUILDDIR" && cd "$BUILDDIR" && pwd -P) +BUILDDIR=$(mkdir -p "$BUILDDIR" && cd "$BUILDDIR" > /dev/null && pwd -P) validate_builddir ########################################################################################### @@ -359,7 +359,7 @@ function genconfig() { info " Features: $FEATURES" # step 1: run usual OE setup to generate conf dir - export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base && pwd -P) + export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base > /dev/null && pwd -P) debug "running oe-init-build-env with TEMPLATECONF=$TEMPLATECONF" info " Running $METADIR/poky/oe-init-build-env" info " Templates dir: $TEMPLATECONF" 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 diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index 27b1de19a..ad2cce7f5 100644 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh @@ -37,11 +37,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 |