From f86690f5bd27074a1784c65fffaaa7974c214e3d Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Thu, 23 Dec 2021 04:09:56 +0000 Subject: [PATCH] Shift from make and stow to shell script to install --- all-shells/.commonshell | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/all-shells/.commonshell b/all-shells/.commonshell index 51e30cc..c8a8f3a 100644 --- a/all-shells/.commonshell +++ b/all-shells/.commonshell @@ -3,6 +3,9 @@ #Mac OSX specific versions alias ls="ls -G" [ -d /usr/local/opt/llvm/bin ] && PATH="$PATH:/usr/local/opt/llvm/bin" + [ -d "$(brew --prefix coreutils)/libexec/gnubin" ] && export PATH="$(brew --prefix coreutils)/libexec/gnubin:$PATH" + [ -d "$(brew --prefix grep)/libexec/gnubin" ] && export PATH="$(brew --prefix grep)/libexec/gnubin:$PATH" + [ -d "$(brew --prefix findutils)/libexec/gnubin" ] && export PATH="$(brew --prefix findutils)/libexec/gnubin:$PATH" else #Linux + others as default alias ls="ls --color=auto" @@ -19,8 +22,8 @@ #export EDITOR="/usr/bin/emacsclient -nw -a /usr/bin/vim" #alias ec=$EDITOR -alias ec="/usr/bin/emacsclient -nw -a /usr/bin/vim" -[ -n "$(whereis vim)" ] && export EDITOR="/usr/bin/vim" +alias ec="/usr/bin/emacsclient -nw -a $(which vim)" +[ -n "$(which vim)" ] && export EDITOR="$(which vim)" #default wine prefix [ -n "$(whereis wine)" ] && export WINEPREFIX=$HOME/.wine/Games/ @@ -37,6 +40,9 @@ export LIBGL_ALWAYS_INDIRECT=1 fi +# acme.sh +[ -f "${HOME}/.acme.sh/acme.sh.env" ] && source ~/.acme.sh/acme.sh.env + # Update dotfiles (git -C ~/.dotfiles pull &) &>/dev/null [ -d ~/.emacs.d ] && (git -C ~/.emacs.d pull &) &>/dev/null -- Gitblit v1.10.0