diff options
Diffstat (limited to '.config/login.d')
| -rw-r--r-- | .config/login.d/00_path.sh | 11 | ||||
| -rw-r--r-- | .config/login.d/10_gpg.sh | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/.config/login.d/00_path.sh b/.config/login.d/00_path.sh index ae2e8db..aa62f75 100644 --- a/.config/login.d/00_path.sh +++ b/.config/login.d/00_path.sh @@ -1,12 +1,7 @@ #!/hint/sh -eval "$( if type config-path &>/dev/null; then - config_path=config-path -else + eval "$(config-path | sed 's/^/export /')" +elif [[ -x "$HOME/.local/bin/config-path" ]]; then # Bootstrap finding config-path - config_path="$HOME/.local/bin/config-path" + eval "$("$HOME/.local/bin/config-path" | sed 's/^/export /')" fi -IFS=$'\n' -lines=($("$config_path")) -printf -- 'export %s\n' "${lines[@]}" -)" diff --git a/.config/login.d/10_gpg.sh b/.config/login.d/10_gpg.sh index 83e4203..01fcbe2 100644 --- a/.config/login.d/10_gpg.sh +++ b/.config/login.d/10_gpg.sh @@ -1,4 +1,4 @@ #!/hint/sh -if [ -z "$GPGKEY" -a -f "${HOME}/.gnupg/gpg.conf" ]; then +if [ -z "$GPGKEY" -a -f "${GNUPG_HOME:-${HOME}/.gnupg}/gpg.conf" ]; then export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${GNUPG_HOME:-${HOME}/.gnupg}/gpg.conf"` fi |