Merge pull request #27618 from copumpkin/no-local-n
stdenv/setup.sh: undo `local -n` change
This commit is contained in:
commit
838a6b747c
|
@ -17,9 +17,10 @@ runHook() {
|
||||||
shift
|
shift
|
||||||
local var="$hookName"
|
local var="$hookName"
|
||||||
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
|
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
|
||||||
local -n var
|
|
||||||
|
eval "local -a dummy=(\"\${$var[@]}\")"
|
||||||
local hook
|
local hook
|
||||||
for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do
|
for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do
|
||||||
_eval "$hook" "$@"
|
_eval "$hook" "$@"
|
||||||
done
|
done
|
||||||
return 0
|
return 0
|
||||||
|
@ -33,9 +34,9 @@ runOneHook() {
|
||||||
shift
|
shift
|
||||||
local var="$hookName"
|
local var="$hookName"
|
||||||
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
|
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
|
||||||
local -n var
|
eval "local -a dummy=(\"\${$var[@]}\")"
|
||||||
local hook
|
local hook
|
||||||
for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do
|
for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do
|
||||||
if _eval "$hook" "$@"; then
|
if _eval "$hook" "$@"; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue