From 898449d60e0f9966db1fe223998f7ad1e5eb45ad Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 May 2017 15:33:51 -0400 Subject: login: load config-path better --- .config/login.d/00_path.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to '.config/login.d') diff --git a/.config/login.d/00_path.sh b/.config/login.d/00_path.sh index ae2e8db..dda528a 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[@]}" -)" -- cgit v1.2.3-54-g00ecf From 2644226e08f429467f79007be853ebc7b66c395b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 May 2017 15:44:05 -0400 Subject: oops --- .config/login.d/00_path.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.config/login.d') diff --git a/.config/login.d/00_path.sh b/.config/login.d/00_path.sh index dda528a..8b3484f 100644 --- a/.config/login.d/00_path.sh +++ b/.config/login.d/00_path.sh @@ -1,7 +1,7 @@ #!/hint/sh if type config-path &>/dev/null; then eval "$(config-path | sed 's/^/export //')" -elif [[ -x "$HOME/.local/bin/config-path"; then +elif [[ -x "$HOME/.local/bin/config-path" ]]; then # Bootstrap finding config-path eval "$("$HOME/.local/bin/config-path" | sed 's/^/export //')" fi -- cgit v1.2.3-54-g00ecf From 9fe48ff5cc04adf81496cc6f39e9c0c2a8668b79 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 May 2017 15:44:50 -0400 Subject: oops --- .config/login.d/00_path.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.config/login.d') diff --git a/.config/login.d/00_path.sh b/.config/login.d/00_path.sh index 8b3484f..aa62f75 100644 --- a/.config/login.d/00_path.sh +++ b/.config/login.d/00_path.sh @@ -1,7 +1,7 @@ #!/hint/sh if type config-path &>/dev/null; then - eval "$(config-path | sed 's/^/export //')" + eval "$(config-path | sed 's/^/export /')" elif [[ -x "$HOME/.local/bin/config-path" ]]; then # Bootstrap finding config-path - eval "$("$HOME/.local/bin/config-path" | sed 's/^/export //')" + eval "$("$HOME/.local/bin/config-path" | sed 's/^/export /')" fi -- cgit v1.2.3-54-g00ecf