Fix environment issues (#337)

* Clean env file

* Remove generated .env

* Fix file_env exporting empty values
This commit is contained in:
Ween Jiann
2021-05-10 16:40:55 +08:00
committed by GitHub
parent 14357b93a1
commit 1b48ab6983
3 changed files with 39 additions and 29 deletions

View File

@@ -27,18 +27,20 @@ file_env() {
local fileVar="${var}_FILE"
local def="${2:-}"
if [ "$(ie_gv ${var})" != "" ] && [ "$(ie_gv ${fileVar})" != "" ]; then
in_error "Both $var and $fileVar are set (but are exclusive)"
fi
local val="$def"
if [ "$(ie_gv ${var})" != "" ]; then
val=$(ie_gv ${var})
elif [ "$(ie_gv ${fileVar})" != "" ]; then
val=$(cat $(ie_gv ${fileVar}))
if [ "$(ie_gv ${fileVar})" != "" ]; then
in_error "Both $var and $fileVar are set (but are exclusive)"
fi
unset "$fileVar"
return
fi
if [ "$(ie_gv ${fileVar})" != "" ] && [ -f "$(ie_gv ${fileVar})" ]; then
export "$var"="$(cat $(ie_gv ${fileVar}))"
elif [ ! -z "$def" ]; then
export "$var"="$def"
fi
export "$var"="$val"
unset "$fileVar"
}