From 65336b03b6da86c6be1f188ad2a75bcdf9337c8c Mon Sep 17 00:00:00 2001 From: yage Date: Tue, 4 Feb 2025 15:31:17 -0700 Subject: [PATCH] more macos stuff --- setup/os-dependencies/macos.txt | 14 +++++++------- setup/os.zsh | 11 +++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/setup/os-dependencies/macos.txt b/setup/os-dependencies/macos.txt index b343925..27afee2 100644 --- a/setup/os-dependencies/macos.txt +++ b/setup/os-dependencies/macos.txt @@ -4,17 +4,19 @@ bat binutils bison cmake +coreutils cowsay feh figlet -coreutils flex fzf +gawk gcc gettext go +gpatch +gsed htop -openjdk jq libtool lolcat @@ -23,18 +25,16 @@ ncurses neofetch node npm +openjdk openssh -patch pkg-config -python pylint -virtualenv +python ripgrep rust -gsed -gawk tmux vim +virtualenv yamllint yq zip diff --git a/setup/os.zsh b/setup/os.zsh index 363691c..7fca852 100644 --- a/setup/os.zsh +++ b/setup/os.zsh @@ -97,6 +97,17 @@ OS__INSTALL_MANAGED_DEPENDENCIES() { yN 'continue with install?' && return 0 || ABORT } + case ${OS_NAME} in + ( macos ) + zsh -c 'source ~/.zprofile &>/dev/null; sed --version 2>&1 | grep GNU | grep -qv BSD' || { + STATUS "detected BSD sed priority; updating GNU utilities in homebrew" + for P in "$(brew --prefix)"/opt/*/libexec/gnubin; do export PATH="$P:$PATH"; done + + echo 'for P in "$(brew --prefix)"/opt/*/libexec/gnubin; do export PATH="$P:$PATH"; done' >> "${HOME}/.zprofile" + } + ;; + esac + SUCCESS 'all dependencies satisfied' return 0 }