commit 9104262333c47920d8d40ab26a0858f3941a9fc4
author Jinwoo Lee <jinwoo@google.com> Fri May 24 20:08:29 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri May 24 20:08:29 2019 +0000
tree 49b0312408e7762ddcf7aea840e8fd05b86de776
parent e13a9f6e0cf3e2dd0e4088b8c1a60aad60764c4c

[fx] make auto-complete work for commands in "tools" and "contrib" too

Change-Id: Ie8dddbce1eeb01a561f3b36e1685f4136fb61378

scripts/fx-env.sh

diff --git a/scripts/fx-env.sh b/scripts/fx-env.sh
index 131f48b..a702ba6 100755
--- a/scripts/fx-env.sh
+++ b/scripts/fx-env.sh
@@ -143,10 +143,14 @@
   }
 
   function __fx {
+    local fuchsia_tools_dir="$(fx-config-read 2>/dev/null; echo "${FUCHSIA_BUILD_DIR}/tools")"
     COMPREPLY=()
     if [[ ${COMP_CWORD} -eq 1 ]]; then
-      COMPREPLY=($(/bin/ls -dp1 ${FUCHSIA_DIR}/tools/devshell/${COMP_WORDS[1]}* 2>/dev/null | \
-        sed -n "s|^${FUCHSIA_DIR}/tools/devshell/\([^/]*\)\$|\1|p" | xargs echo))
+      for dir in "${FUCHSIA_DIR}/tools/devshell" "${FUCHSIA_DIR}/tools/devshell/contrib" "${fuchsia_tools_dir}"
+      do
+        COMPREPLY=(${COMPREPLY} $(/bin/ls -dp1 ${dir}/${COMP_WORDS[1]}* 2>/dev/null | \
+          sed -n "s|^${dir}/\([^/]*\)\$|\1|p" | xargs echo))
+      done
     else
       __fx_complete_cmd
     fi