diff options
| author | Toby Vincent <tobyv13@gmail.com> | 2023-05-24 16:36:32 -0500 |
|---|---|---|
| committer | Toby Vincent <tobyv13@gmail.com> | 2023-05-24 16:36:32 -0500 |
| commit | efc827f5a9efc072bd6cd248631e9647d048756f (patch) | |
| tree | e66537fc5128aca80580fa640546970f3ac187d9 /sh/.config/profile.d | |
| parent | c930c1e72e861bb285d77e0ccd3efe48d8f36739 (diff) | |
fix: prevent PATH from being overridden
Also, mimic Arch's /etc/profile more accurately, switching to
append-path API function that is called from auxiliary profile.d scripts.
Diffstat (limited to 'sh/.config/profile.d')
| -rw-r--r-- | sh/.config/profile.d/20-dotnet.sh | 5 | ||||
| -rw-r--r-- | sh/.config/profile.d/20-go.sh | 8 | ||||
| -rw-r--r-- | sh/.config/profile.d/20-perl.sh | 5 | ||||
| -rw-r--r-- | sh/.config/profile.d/20-ruby.sh | 3 |
4 files changed, 15 insertions, 6 deletions
diff --git a/sh/.config/profile.d/20-dotnet.sh b/sh/.config/profile.d/20-dotnet.sh index 9e89365..f7ac5a6 100644 --- a/sh/.config/profile.d/20-dotnet.sh +++ b/sh/.config/profile.d/20-dotnet.sh @@ -2,4 +2,7 @@ export OMNISHARPHOME="$XDG_CONFIG_HOME/omnisharp" export DOTNET_CLI_HOME="$XDG_DATA_HOME/dotnet" -export PATH="$PATH:$DOTNET_CLI_HOME/tools" + +append_path "$DOTNET_CLI_HOME/tools" + +export PATH diff --git a/sh/.config/profile.d/20-go.sh b/sh/.config/profile.d/20-go.sh index 58d8115..252ba47 100644 --- a/sh/.config/profile.d/20-go.sh +++ b/sh/.config/profile.d/20-go.sh @@ -1,7 +1,9 @@ #!/bin/sh -export GOPATH="$XDG_DATA_HOME/go" -export PATH="$PATH:$GOPATH/bin" - # See: https://drewdevault.com/2022/05/25/Google-has-been-DDoSing-sourcehut.html export GOPRIVATE=git.sr.ht +export GOPATH="$XDG_DATA_HOME/go" + +append_path "$GOPATH/bin" + +export PATH diff --git a/sh/.config/profile.d/20-perl.sh b/sh/.config/profile.d/20-perl.sh index 8ee3b93..13d5e0b 100644 --- a/sh/.config/profile.d/20-perl.sh +++ b/sh/.config/profile.d/20-perl.sh @@ -5,4 +5,7 @@ export PERL_LOCAL_LIB_ROOT="$XDG_DATA_HOME/perl" export PERL5LIB="$PERL_LOCAL_LIB_ROOT/lib/perl5" export PERL_MB_OPT="--install_base '$PERL_LOCAL_LIB_ROOT'" export PERL_MM_OPT="INSTALL_BASE=$PERL_LOCAL_LIB_ROOT" -export PATH="$PATH:$PERL_LOCAL_LIB_ROOT/bin" + +append_path "$PERL_LOCAL_LIB_ROOT/bin" + +export PATH diff --git a/sh/.config/profile.d/20-ruby.sh b/sh/.config/profile.d/20-ruby.sh index 1336853..757bd95 100644 --- a/sh/.config/profile.d/20-ruby.sh +++ b/sh/.config/profile.d/20-ruby.sh @@ -2,5 +2,6 @@ if command -v ruby >/dev/null && command -v gem >/dev/null; then GEM_USER_DIR="$(ruby -r rubygems -e 'puts Gem.user_dir')" - export PATH="$PATH:$GEM_USER_DIR" + [ -d "$GEM_USER_DIR" ] && append_path "$GEM_USER_DIR" + export PATH fi |