fix mt-mapperd pithos read bug. plus some minor fixes

[archipelago] / xseg / envsetup

diff --git a/xseg/envsetup b/xseg/envsetup
index 19906c8..9803bfa 100755 (executable)
--- a/xseg/envsetup
+++ b/xseg/envsetup
@@ -45,8 +45,10 @@ if [ "$1" = "show" ]; then
        echo "export PATH="${PATH}
        echo "export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}
 else
-       [ -z "$SHELL" ] && SHELL=/bin/bash
+       if [ -z "${NONINTERACTIVE}" ]; then
+               [ -z "$SHELL" ] && SHELL=/bin/bash
 
-       selfname=$(basename -- "${0}")
-       [ "$selfname" = "envsetup" ] && exec "$SHELL"
+               selfname=$(basename -- "${0}")
+               [ "$selfname" = "envsetup" ] && exec "$SHELL"
+       fi
 fi