From b1124b5c2949182d047bf1ee9f55e88177e3bb1a Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Wed, 4 Jul 2012 19:58:30 -0500 Subject: [PATCH] Avoid unsetting needed variables during recursive inclusion --- bash-config/common | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bash-config/common b/bash-config/common index a0e9c45..1ddb2f0 100644 --- a/bash-config/common +++ b/bash-config/common @@ -4,6 +4,7 @@ if [ -z "${__BASH_CONFIG_LOADED}" ] || echo "${__BASH_CONFIG_LOADED}" | grep -qv " ${_self} " then __BASH_CONFIG_LOADED="${__BASH_CONFIG_LOADED} ${_self} " + __BASH_CONFIG_DEPTH=$(( ${__BASH_CONFIG_DEPTH:-0} + 1 )) # Interactive shell? _i() { [[ $- == *i* ]]; return $?; } @@ -19,5 +20,6 @@ then done | sed -e 's/^/source /; s/$/;/' )" - unset _base _self _i + __BASH_CONFIG_DEPTH=$(( ${__BASH_CONFIG_DEPTH} - 1 )) + [ "${__BASH_CONFIG_DEPTH}" -gt 0 ] || unset _base _self _i __BASH_CONFIG_DEPTH fi -- 2.42.0