am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"

* commit '1708a6f74bf36ad6d520476895695c26bdaf7306': Avoid complaining about empty directories
2011-07-18 13:48:43 -07:00 · 2011-07-18 13:48:43 -07:00 · 3146eb76cf
parent 1b61d1ba7b 1708a6f74b
commit 3146eb76cf
1 changed files with 1 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@ -207,7 +207,7 @@ function addcompletions()

    dir="sdk/bash_completion"
    if [ -d ${dir} ]; then
-        for f in ${dir}/[a-z]*.bash; do
+        for f in `/bin/ls ${dir}/[a-z]*.bash 2> /dev/null`; do
            echo "including $f"
            . $f
        done