From bd0c4dd6ab6465b50fb9ca3c332400d0c590509b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 24 Nov 2019 17:51:46 -0500 Subject: [PATCH] root: fix setupHook to work with "set -u" --- pkgs/applications/science/misc/root/setup-hook.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index fc2b697d8a8..b26cf9b779f 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -1,9 +1,13 @@ thisroot () { # Workaround thisroot.sh dependency on man - if [ -z "${MANPATH}" ]; then + if [ -z "${MANPATH-}" ]; then MANPATH=: fi + local oldOpts="-u" + shopt -qo nounset || oldOpts="+u" + set +u source @out@/bin/thisroot.sh + set "$oldOpts" } postHooks+=(thisroot)