fix: source completions even if not brew user

ublue-os · May 13, 2024 · 9dce7a9 · 9dce7a9
1 parent 949a96b
commit 9dce7a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/system_files/shared/usr/etc/profile.d/brew-bash-completion.sh b/system_files/shared/usr/etc/profile.d/brew-bash-completion.sh
@@ -10,14 +10,14 @@ if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BREW_BASH_COMPLETION-}"
             if ! test -L /home/linuxbrew/.linuxbrew/etc/bash_completion.d/brew; then
                 /home/linuxbrew/.linuxbrew/bin/brew completions link > /dev/null
             fi
-            if test -d /home/linuxbrew/.linuxbrew/etc/bash_completion.d; then
-                for rc in /home/linuxbrew/.linuxbrew/etc/bash_completion.d/*; do
-                    if test -r "$rc"; then
-                    . "$rc"
-                    fi
-                done
-                unset rc
-            fi
+        fi
+        if test -d /home/linuxbrew/.linuxbrew/etc/bash_completion.d; then
+            for rc in /home/linuxbrew/.linuxbrew/etc/bash_completion.d/*; do
+                if test -r "$rc"; then
+                . "$rc"
+                fi
+            done
+            unset rc
         fi
     fi
     BREW_BASH_COMPLETION=1

diff --git a/system_files/shared/usr/etc/zsh/zshrc b/system_files/shared/usr/etc/zsh/zshrc
@@ -16,13 +16,13 @@
 # Brew needs to be loaded before compinit is called
 if [[ -o interactive ]] && [[ -d /home/linuxbrew/.linuxbrew ]]; then
   eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-  if [[ -w /home/linuxbrew/.linuxbrew ]]; then
-    if type brew &>/dev/null; then
+  if type brew &>/dev/null; then
+    if [[ -w /home/linuxbrew/.linuxbrew ]]; then
       if [[ ! -L "$(brew --prefix)/share/zsh/site-functions/_brew" ]]; then
         brew completions link
       fi
-      FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
     fi
+    FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
   fi
 fi