Put zsh completions in correct place in homebrew bottle, fixes #2317 (#…

…2326)
ddev · Jun 23, 2020 · 7c866fa · 7c866fa
1 parent 0c5a034
commit 7c866fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.circleci/bump_homebrew.sh b/.circleci/bump_homebrew.sh
@@ -60,6 +60,7 @@ class Ddev < Formula
     end
     bash_completion.install ".gotmp/bin/ddev_bash_completion.sh" => "ddev"
     zsh_completion.install ".gotmp/bin/ddev_zsh_completion.sh" => "ddev"
+    fish_completion.install ".gotmp/bin/ddev_fish_completion.sh" => "ddev"
   end
 
   test do

diff --git a/.circleci/generate_artifacts.sh b/.circleci/generate_artifacts.sh
@@ -85,9 +85,10 @@ for os in sierra x86_64_linux ; do
     NO_V_VERSION=${VERSION#v}
     rm -rf /tmp/bottle
     BOTTLE_BASE=/tmp/bottle/ddev/$NO_V_VERSION
-    mkdir -p $BOTTLE_BASE/{bin,etc/bash_completion.d,share/zsh-completions}
+    mkdir -p $BOTTLE_BASE/{bin,etc/bash_completion.d,share/zsh/site-functions,share/fish/vendor_completions.d}
     cp $BASE_DIR/.gotmp/bin/ddev_bash_completion.sh $BOTTLE_BASE/etc/bash_completion.d/ddev
-    cp $BASE_DIR/.gotmp/bin/ddev_zsh_completion.sh $BOTTLE_BASE/share/zsh-completions/_ddev
+    cp $BASE_DIR/.gotmp/bin/ddev_zsh_completion.sh $BOTTLE_BASE/share/zsh/site-functions/_ddev
+    cp $BASE_DIR/.gotmp/bin/ddev_fish_completion.sh $BOTTLE_BASE/share/fish/vendor_completions.d/ddev.fish
 
     if [ "${os}" = "sierra" ]; then cp $BASE_DIR/.gotmp/bin/darwin_amd64/ddev $BOTTLE_BASE/bin ; fi
     if [ "${os}" = "x86_64_linux" ]; then cp $BASE_DIR/.gotmp/bin/ddev $BOTTLE_BASE/bin ; fi