Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
Signed-off-by: Jess Frazelle <github@jessfraz.com>
  • Loading branch information
jessfraz committed Jan 22, 2025
1 parent 6241956 commit 9e86842
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
15 changes: 15 additions & 0 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ if ! shopt -oq posix; then
. /usr/local/etc/bash_completion
fi
fi

if [[ -d /etc/bash_completion.d/ ]]; then
for file in /etc/bash_completion.d/* ; do
if [[ -n $BASHRC_BENCH ]]; then
Expand All @@ -108,6 +109,20 @@ if [[ -d /etc/bash_completion.d/ ]]; then
done
fi

hbfile="/opt/homebrew/etc/profile.d/bash_completion.sh"
if [[ -f "$hbfile" ]]; then
if [[ -n $BASHRC_BENCH ]]; then
TIMEFORMAT="$hbfile: %R"
# shellcheck source=/dev/null
time . "$hbfile"
unset TIMEFORMAT
else
# shellcheck source=/dev/null
. "$hbfile"
fi
fi
unset hbfile

# We do this before the following so that all the paths work.
for file in ~/.{bash_prompt,aliases,functions,path,dockerfunc,extra,exports}; do
if [[ -r "$file" ]] && [[ -f "$file" ]]; then
Expand Down
7 changes: 2 additions & 5 deletions .path
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export PATH="/opt/homebrew/opt/mysql-client/bin:${PATH}"
# update cdpath
export CDPATH=${CDPATH}:${GOPATH}/src/github.com:${GOPATH}/src/golang.org:${GOPATH}/src

export PATH="${HOME}/.google-cloud-sdk/bin:${PATH}"

# The next line updates PATH for the Google Cloud SDK.
# shellcheck source=/dev/null
if [ -f "${HOME}/.google-cloud-sdk/path.bash.inc" ]; then . "${HOME}/.google-cloud-sdk/path.bash.inc"; fi
Expand All @@ -38,8 +40,6 @@ if [ -f "${HOME}/.google-cloud-sdk/path.bash.inc" ]; then . "${HOME}/.google-clo
# shellcheck source=/dev/null
if [ -f "${HOME}/.google-cloud-sdk/completion.bash.inc" ]; then . "${HOME}/.google-cloud-sdk/completion.bash.inc"; fi

export PATH="${HOME}/.google-cloud-sdk/bin:${PATH}"

# update path for gnu coreutils, make & find on darwin
export PATH=/usr/local/opt/coreutils/libexec/gnubin:${PATH}
export MANPATH=/usr/local/opt/coreutils/libexec/gnuman:${MANPATH}
Expand All @@ -55,9 +55,6 @@ export LIBRARY_PATH="/opt/homebrew/lib:${LIBRARY_PATH}"
export LDFLAGS="${LDFLAGS} -L/opt/homebrew/lib"
export CPPFLAGS="${CPPFLAGS} -I/opt/homebrew/include"

# shellcheck source=/dev/null
if [ -f "/opt/homebrew/etc/profile.d/bash_completion.sh" ]; then . "/opt/homebrew/etc/profile.d/bash_completion.sh"; fi

# OpenSSL
export PATH="/opt/homebrew/opt/openssl/bin:${PATH}"
export LDFLAGS="${LDFLAGS} -L/opt/homebrew/opt/openssl/lib"
Expand Down

0 comments on commit 9e86842

Please sign in to comment.