Merge branch 'master' into staging-next

2019-11-27 22:57:50 -08:00
parent 4cc592761d f4f8169021
commit 0c1c18ca44
207 changed files with 4017 additions and 3629 deletions
@@ -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)