[#83] Always evaluate dircolors if installed

13 years ago · 070c6756a8
2 changed files with 6 additions and 2 deletions
--- a/alias.zsh
+++ b/alias.zsh
@ -14,7 +14,9 @@ if (( $+commands[dircolors] )); then
				@@ -14,7 +14,9 @@ if (( $+commands[dircolors] )); then

  if zstyle -t ':omz:alias:ls' color; then
    if [[ -f "$HOME/.dir_colors" ]]; then
-      eval $(dircolors "$HOME/.dir_colors")
+      eval "$(dircolors "$HOME/.dir_colors")"
+    else
+      eval "$(dircolors)"
    fi
    alias ls="$aliases[ls] --color=auto"
  else
--- a/plugins/gnu-utils/init.zsh
+++ b/plugins/gnu-utils/init.zsh
@ -82,7 +82,9 @@ alias ls='ls --group-directories-first'
				@@ -82,7 +82,9 @@ alias ls='ls --group-directories-first'

 if zstyle -t ':omz:alias:ls' color; then
  if [[ -f "$HOME/.dir_colors" ]]; then
-    eval $(gdircolors "$HOME/.dir_colors")
+    eval "$(gdircolors "$HOME/.dir_colors")"
+  else
+    eval "$(gdircolors)"
  fi
  alias ls="$aliases[ls] --color=auto"
 else