From eaf489b84892a6895cba17b13a083e4f36e9594c Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Tue, 6 Dec 2022 16:57:53 +0000 Subject: [PATCH] Update .local/share/chezmoi/home/dot_local/bin/executable_install-program, .local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl --- .../home/dot_local/bin/executable_install-program | 3 ++- .../home/private_dot_config/shell/aliases.sh.tmpl | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_install-program b/.local/share/chezmoi/home/dot_local/bin/executable_install-program index 79753838..04b88107 100644 --- a/.local/share/chezmoi/home/dot_local/bin/executable_install-program +++ b/.local/share/chezmoi/home/dot_local/bin/executable_install-program @@ -887,7 +887,8 @@ async function ensurePackageManager(packageManager) { cd macports-base sudo git checkout v2.8.0 sudo ./configure --enable-readline - make + # * asciidoc, xsltproc (port libxslt) and docbook-xsl-nons are required to generate man pages from source. + sudo make make install make distclean ` diff --git a/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl b/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl index a72794b2..f5761ff5 100644 --- a/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl +++ b/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl @@ -2,11 +2,12 @@ {{ if eq .chezmoi.os "darwin" }} ### macOS Polyfills -if command -v brew > /dev/null; then - PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH" - PATH="$(brew --prefix)/opt/gnu-indent/libexec/gnubin:$PATH" - PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH" -fi +# Conflicts with Mac Port installation +# if command -v brew > /dev/null; then +# PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH" +# PATH="$(brew --prefix)/opt/gnu-indent/libexec/gnubin:$PATH" +# PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH" +# fi {{- end }} ### bat