bash: Fix loading bash specific profile and env files

This commit is contained in:
Marty Oehme 2022-06-28 10:24:57 +02:00
parent e25ce19719
commit 4bff036d1d
Signed by: Marty
GPG Key ID: B7538B8F50A1C800
3 changed files with 29 additions and 8 deletions

View File

@ -10,19 +10,33 @@ export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-"$HOME/.config"}
# load global sh env vars
[ -f "$XDG_CONFIG_HOME/sh/env" ] && source "$XDG_CONFIG_HOME/sh/env"
if [ -d "$XDG_CONFIG_HOME/sh/env.d" ]; then
for _env in "$XDG_CONFIG_HOME/sh/env.d"/*.sh; do
. "$_env"
done
unset _env
for _env in "$XDG_CONFIG_HOME/sh/env.d"/*.sh; do
. "$_env"
done
unset _env
fi
[ -f "$XDG_CONFIG_HOME/bash/env" ] && source "$XDG_CONFIG_HOME/bash/env"
if [ -d "$XDG_CONFIG_HOME/bash/env.d" ]; then
for _env in "$XDG_CONFIG_HOME/bash/env.d"/*.sh; do
. "$_env"
done
unset _env
fi
# load profile files vars
[ -f "$XDG_CONFIG_HOME/sh/profile" ] && source "$XDG_CONFIG_HOME/sh/profile"
if [ -d "$XDG_CONFIG_HOME/sh/profile.d" ]; then
for _profile in "$XDG_CONFIG_HOME/sh/profile.d"/*.sh; do
. "$_profile"
done
unset _profile
for _profile in "$XDG_CONFIG_HOME/sh/profile.d"/*.sh; do
. "$_profile"
done
unset _profile
fi
[ -f "$XDG_CONFIG_HOME/bash/profile" ] && source "$XDG_CONFIG_HOME/bash/profile"
if [ -d "$XDG_CONFIG_HOME/bash/profile.d" ]; then
for _profile in "$XDG_CONFIG_HOME/bash/profile.d"/*.sh; do
. "$_profile"
done
unset _profile
fi
# shellcheck disable=SC1090

View File

@ -1,3 +1,4 @@
#!/usr/bin/env bash
#
# ~/.bashrc
#

View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
export HISTFILE="${XDG_STATE_HOME}/bash/history"
# bashrc, bash_profile, bash_logout currently unsupported
# see https://savannah.gnu.org/support/?108134