From 41c21771a14d07f08febb2a2b2cb801e45a0b118 Mon Sep 17 00:00:00 2001 From: sev Date: Wed, 23 Mar 2022 22:18:32 -0500 Subject: [PATCH] zprofile: always prefer user bin dirs --- base/.zprofile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/.zprofile b/base/.zprofile index f611b98..9179bcb 100644 --- a/base/.zprofile +++ b/base/.zprofile @@ -83,8 +83,9 @@ if [[ ! -v _sev_setup_path || -o login ]] { # NOTE: /usr/{local,pkg,games} are unix/bsdisms # XXX: PREFIX not validated, non-posix but Termux uses it syspath=("$path[@]") - path=({~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/sbin - {~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/bin + path=(~/{s,}bin + {~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/sbin + {~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/bin /usr/{X11R{7,6}/bin,games}) ((len=$#path)) path=("$path[@]" "$syspath[@]") @@ -99,7 +100,7 @@ if [[ ! -v _sev_setup_path || -o login ]] { } # shift valid system paths to the front if there are any left ((len > 0 && len < $#path)) && path=("${(@)path[len + 1, -1]}" "${(@)path[1, len]}") - unset syspath len i j + unset syspath len i # include our zsh dir in fpath. unlike above, we always prefer our paths fpath=(${ZDOTDIR:-~/.zsh}/functions/{*,Completions/*}(N) "$fpath[@]") # FPATH is not exported by default -- 2.47.0