Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 129b8fad authored by Sebastian Schmidt's avatar Sebastian Schmidt
Browse files

Fix vendorsetup.sh inclusion for zsh

zsh defaults to the NOMATCH option when a glob doesn't match any file.
This causes the inclusion of the vendorsetup.sh files in envsetup.sh to
fail if any argument to ls won't expand. Setting NULLGLOB, which
resembles bash's behavior, for the subshell fixes that.

Change-Id: I549840e3b1ed17b76dbcd94fdd63321ec5915162
parent b53fce86
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ else
fi
unset _xarray

for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
for f in `{ setopt nullglob; /bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh device/*/*/vendorsetup.sh; } 2> /dev/null`
do
    echo "including $f"
    . $f