Split 30_env into "ax-io" and "zshrc" stage

We want it to fix TMPDIR etc. in non-login shells, too! And this makes
sense, as there are some startup sequences (for example when using
screen(1) or tmux(1)) which result in br0ken TMPDIR settings ..

diff --git a/core/30_env/30_env.ax-io b/core/30_env/30_env.ax-io
index 87875402633f5563ea1f596cab2bdc09701117fe..984b9599ad6fb674813b1b52aea080d547cca1ff 100644 (file)
--- a/core/30_env/30_env.ax-io
+++ b/core/30_env/30_env.ax-io
@@ -14,13 +14,6 @@ fi
 if [[ ! -w "$TMPDIR" ]]; then
        echo "WARNING: Temporary directory \"$TMPDIR\" is not writable!" >&2
 fi
-# Make sure TMPDIR ends in a slash (like on macOS by default): this makes its
-# usage a bit safer ...
-case "$TMPDIR" in
-       */) ;;
-       *)  TMPDIR="$TMPDIR/"
-esac
-export TMPDIR
 
 # Setup XDG cache directory
 if [[ -z "$XDG_CACHE_HOME" ]]; then

diff --git a/core/30_env/30_env.zshrc b/core/30_env/30_env.zshrc
new file mode 100644 (file)
index 0000000..4187712
--- /dev/null
+++ b/core/30_env/30_env.zshrc
@@ -0,0 +1,17 @@
+# AX-ZSH: Alex' Modular ZSH Configuration
+# 30_env.ax-io: Setup environment
+
+# Make sure TMPDIR ends in a slash (like on macOS by default): this makes its
+# usage a bit safer ...
+case "$TMPDIR" in
+       */) ;;
+       *)  TMPDIR="$TMPDIR/"
+esac
+export TMPDIR
+
+# TMPDIR is the only one required to be set, but make sure that TMP, TEMP
+# and TEMPDIR are set to the same sane path name when already present in the
+# environment:
+[[ -n "$TMP" ]] && TMP="$TMPDIR"
+[[ -n "$TEMP" ]] && TEMP="$TMPDIR"
+[[ -n "$TEMPDIR" ]] && TEMPDIR="$TMPDIR"