commit 295a344eb91e88788eefe498de8cbd09a9bf1b5d parent 98c68c2422e066a4ddd1243c6e5e63bd6a9c2328 Author: Alex Balgavy <a.balgavy@gmail.com> Date: Tue, 27 Oct 2020 11:35:44 +0100 shell: add elan to path and fix based on shellcheck Former-commit-id: 25ea87615278018721ae54c1d41ef01ac6e296cd Diffstat:
| M | shell/paths | | | 23 | ++++++++++++----------- |
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/shell/paths b/shell/paths @@ -1,15 +1,16 @@ #!/bin/sh [ -x /usr/libexec/path_helper ] && unset PATH && eval "$(/usr/libexec/path_helper -s)" -[ -d "$HOME/.local/bin" -o -L "$HOME/.local/bin" ] && [ -n "${PATH##*"$HOME/.local/bin"*}" ] && PATH="$HOME/.local/bin:$PATH" -[ -d "$HOME/go/bin" -o -L "$HOME/go/bin" ] && [ -n "${PATH##*"$HOME/go/bin"*}" ] && PATH="$HOME/go/bin:$PATH" -[ -d "/usr/local/opt/util-linux/bin" -o -L "/usr/local/opt/util-linux/bin" ] && [ -n "${PATH##*"/usr/local/opt/util-linux/bin"*}" ] && PATH="/usr/local/opt/util-linux/bin:$PATH" -[ -d "$HOME/.config/.ghcup/bin" -o -L "$HOME/.config/.ghcup/bin" ] && [ -n "${PATH##*"$HOME/.config/.ghcup/bin"*}" ] && PATH="$HOME/.config/.ghcup/bin:$PATH" -[ -d "/usr/local/sbin" -o -L "/usr/local/sbin" ] && [ -n "${PATH##*"/usr/local/sbin"*}" ] && PATH="/usr/local/sbin:$PATH" -[ -d "/usr/local/opt/coreutils/libexec/gnubin" -o -L "/usr/local/opt/coreutils/libexec/gnubin" ] && [ -n "${PATH##*"/usr/local/opt/coreutils/libexec/gnubin"*}" ] && PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" -[ -d "$HOME/.local/gnat/bin" -o -L "$HOME/.local/gnat/bin" ] && [ -n "${PATH##*"$HOME/.local/gnat/bin"*}" ] && PATH="$HOME/.local/gnat/bin:$PATH" -[ -d "$HOME/bin" -o -L "$HOME/bin" ] && [ -n "${PATH##*"$HOME/bin"*}" ] && PATH="$HOME/bin:$PATH" -[ -d "$HOME/.bin" -o -L "$HOME/.bin" ] && [ -n "${PATH##*"$HOME/.bin"*}" ] && PATH="$HOME/.bin:$PATH" -[ -d "$HOME/.scripts" -o -L "$HOME/.scripts" ] && [ -n "${PATH##*"$HOME/.scripts"*}" ] && PATH="$HOME/.scripts:$PATH" -[ -d "$HOME/.local/share/gems/bin" -o -L "$HOME/.local/share/gems/bin" ] && [ -n "${PATH##*"$HOME/.local/share/gems/bin"*}" ] && PATH="$HOME/.local/share/gems/bin:$PATH" +[ -d "$HOME/.local/bin" ] || [ -L "$HOME/.local/bin" ] && [ -n "${PATH##*"$HOME/.local/bin"*}" ] && PATH="$HOME/.local/bin:$PATH" +[ -d "$HOME/go/bin" ] || [ -L "$HOME/go/bin" ] && [ -n "${PATH##*"$HOME/go/bin"*}" ] && PATH="$HOME/go/bin:$PATH" +[ -d "/usr/local/opt/util-linux/bin" ] || [ -L "/usr/local/opt/util-linux/bin" ] && [ -n "${PATH##*"/usr/local/opt/util-linux/bin"*}" ] && PATH="/usr/local/opt/util-linux/bin:$PATH" +[ -d "$HOME/.config/.ghcup/bin" ] || [ -L "$HOME/.config/.ghcup/bin" ] && [ -n "${PATH##*"$HOME/.config/.ghcup/bin"*}" ] && PATH="$HOME/.config/.ghcup/bin:$PATH" +[ -d "/usr/local/sbin" ] || [ -L "/usr/local/sbin" ] && [ -n "${PATH##*"/usr/local/sbin"*}" ] && PATH="/usr/local/sbin:$PATH" +[ -d "/usr/local/opt/coreutils/libexec/gnubin" ] || [ -L "/usr/local/opt/coreutils/libexec/gnubin" ] && [ -n "${PATH##*"/usr/local/opt/coreutils/libexec/gnubin"*}" ] && PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" +[ -d "$HOME/.local/gnat/bin" ] || [ -L "$HOME/.local/gnat/bin" ] && [ -n "${PATH##*"$HOME/.local/gnat/bin"*}" ] && PATH="$HOME/.local/gnat/bin:$PATH" +[ -d "$HOME/bin" ] || [ -L "$HOME/bin" ] && [ -n "${PATH##*"$HOME/bin"*}" ] && PATH="$HOME/bin:$PATH" +[ -d "$HOME/.bin" ] || [ -L "$HOME/.bin" ] && [ -n "${PATH##*"$HOME/.bin"*}" ] && PATH="$HOME/.bin:$PATH" +[ -d "$HOME/.scripts" ] || [ -L "$HOME/.scripts" ] && [ -n "${PATH##*"$HOME/.scripts"*}" ] && PATH="$HOME/.scripts:$PATH" +[ -d "$HOME/.local/share/gems/bin" ] || [ -L "$HOME/.local/share/gems/bin" ] && [ -n "${PATH##*"$HOME/.local/share/gems/bin"*}" ] && PATH="$HOME/.local/share/gems/bin:$PATH" +[ -d "$HOME/.elan/bin" ] && [ -n "${PATH##*"$HOME/.elan/bin"*}" ] && PATH="$HOME/.elan/bin:$PATH" command -v rbenv 1>/dev/null 2>&1 && eval "$(rbenv init -)" export PATH