From 50cae027bcaf1aa4c4676de054bdb0a778518318 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 23 Sep 2021 17:14:29 +0800 Subject: [PATCH] feat: split loadenv from readenv to load any file --- cli/fish/config.fish | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/cli/fish/config.fish b/cli/fish/config.fish index 51192dd..fdb6ac5 100644 --- a/cli/fish/config.fish +++ b/cli/fish/config.fish @@ -70,19 +70,23 @@ if status is-interactive # === auto cd into last activated directory test "$PWD" = "$HOME" && cd $last_pwd + function loadenv + while read -l line + set -l line (string trim $line) + if [ -z "$line" ] + continue + end + if string match -q '#*' $line + continue + end + set -l kv (string split -m 1 = -- $line) + set -gx $kv + end < $argv[1] + end + function readenv --on-variable PWD if test -r .env - while read -l line - set -l line (string trim $line) - if [ -z "$line" ] - continue - end - if string match -q '#*' $line - continue - end - set -l kv (string split -m 1 = -- $line) - set -gx $kv - end < .env + loadenv .env end end end