Skip to content
Snippets Groups Projects
Commit 5f1229ee authored by Christian Dreher's avatar Christian Dreher
Browse files

Merge branch 'fix/remove-env-workspace-deac' into 'main'

Removing appended paths for workspace deactivation/switching in bash

See merge request sw/armarx/meta/axii!777
parents 0e5669f7 ad249185
No related branches found
Tags v0.9.0
No related merge requests found
......@@ -11,17 +11,16 @@ function _axii_env_reset()
_axii_echo "Remove values to appended/prepended variables."
for var in "${!_axii_env_removals_from_appended_vars[@]}"; do
unset "_axii_env_removals_from_appended_vars[$var]"
local old_ifs="$IFS"
IFS=":"
read -r -a array <<< "${_axii_env_removals_from_appended_vars[$var]}"
IFS="$old_ifs"
for part in $value; do
for part in ${array[@]}; do
_axii_echo "Remove '$part' from '$var'."
_axii_env_remove_from "$var" "$part"
done
IFS="$old_ifs"
done
for var in "${_axii_env_added_env_vars[@]}"; do
......@@ -63,7 +62,7 @@ function _axii_env_remove_later()
if [[ ! -v _axii_env_removals_from_appended_vars[$var] ]]; then
_axii_env_removals_from_appended_vars[$var]="$val"
else
old_value=$_axii_env_removals_from_appended_vars[$var]
old_value=${_axii_env_removals_from_appended_vars[$var]}
_axii_env_removals_from_appended_vars[$var]="$old_value:$val"
fi
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment