Skip to content

Commit 71eb367

Browse files
authored
update/environment vars (#5)
* remove regex for whitelisting vars * remove indent (non interactive stream editor) from export_env_dir outputs * indent echo vars in environment script
1 parent d688c89 commit 71eb367

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

bin/compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source "$BP_DIR"/lib/dependencies.sh
2626

2727
header "Runtime environment"
2828

29-
export_env_dir "$ENV_DIR" | indent
29+
export_env_dir "$ENV_DIR"
3030

3131
### Check initial state
3232

lib/environment.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
function export_env_dir() {
44
local env_dir="$1"
5-
local whitelist_regex="${2:-''}"
6-
local blacklist_regex="${3:-'^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH|LANG)$'}"
5+
local blacklist_regex="${2:-'^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH|LANG)$'}"
76

87
if [[ -d "$env_dir" ]]; then
98
for e in $(ls "$env_dir"); do
10-
echo "$e=$(cat $env_dir/$e)"
11-
echo "$e" | grep -E "$whitelist_regex" | grep -qvE "$blacklist_regex" && export "$e=$(cat $env_dir/$e)"
9+
echo " $e=$(cat $env_dir/$e)"
10+
echo "$e" | grep -qvE "$blacklist_regex" && export "$e=$(cat $env_dir/$e)"
1211
:
1312
done
1413
fi

0 commit comments

Comments
 (0)