From bd8b984fcb7b0135ad954e2ddd2659c4140d87ca Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Tue, 18 Jan 2022 09:19:41 -0500 Subject: [PATCH] Prefer gnu-sed --- Makefile | 18 ++++++++++-------- zsh/.zshenv | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 8289d0e..64d990a 100644 --- a/Makefile +++ b/Makefile @@ -5,26 +5,28 @@ all: install install: stow $(STOWED) -alacritty: - curl -fLo /tmp/alacritty.info https://raw.githubusercontent.com/alacritty/alacritty/master/extra/alacritty.info - sudo tic -xe alacritty,alacritty-direct /tmp/alacritty.info - toggle-color-bin - -javascript: nodenv-base nodenv-build - linux: sudo apt-get install direnv fzf silversearcher-ag stow tmux vim zsh mac: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" sudo mv /etc/{zprofile,zprofile.old} - brew install coreutils direnv fzf git stow the_silver_searcher tmux vim zsh + brew install coreutils gnu-sed direnv fzf git stow the_silver_searcher tmux vim zsh + +javascript: nodenv-base nodenv-build ruby: rbenv-base rbenv-build +alacritty: + curl -fLo /tmp/alacritty.info https://raw.githubusercontent.com/alacritty/alacritty/master/extra/alacritty.info + sudo tic -xe alacritty,alacritty-direct /tmp/alacritty.info + toggle-color-bin + vim: curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + + rbenv-base: if test ! -d ~/.rbenv ; then \ git clone https://github.com/rbenv/rbenv.git ~/.rbenv ; \ diff --git a/zsh/.zshenv b/zsh/.zshenv index c63683b..f327b86 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -10,6 +10,7 @@ if [[ "$OSTYPE" == darwin* ]]; then HOMEBREW_CELLAR="/opt/homebrew/Cellar" HOMEBREW_REPOSITORY="/opt/homebrew" + GNU_SED_PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin" GNU_TOOLS_PATH="/opt/homebrew/opt/coreutils/libexec/gnubin" GNU_TOOLS_MAN_PATH="/opt/homebrew/opt/coreutils/libexec/gnuman" @@ -19,6 +20,7 @@ if [[ "$OSTYPE" == darwin* ]]; then MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:"; INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}"; + [[ -d "$GNU_SED_PATH" ]] && PATH="$GNU_SED_PATH:$PATH" [[ -d "$GNU_TOOLS_PATH" ]] && PATH="$GNU_TOOLS_PATH:$PATH" [[ -d "$GNU_TOOLS_MAN_PATH" ]] && MANPATH="$GNU_TOOLS_MAN_PATH:$MANPATH" fi