Correctly test XDG_CACHE_HOME for writability for "stamp files"

[ax-zsh.git] / core / 01_zprofile / 01_zprofile.zshrc

diff --git a/core/01_zprofile/01_zprofile.zshrc b/core/01_zprofile/01_zprofile.zshrc
index 93a423d43e19b925460599d73cf115bf1c160be1..8e257cd46ca9159270c60145ff64b72b75fd9fc6 100644 (file)
--- a/core/01_zprofile/01_zprofile.zshrc
+++ b/core/01_zprofile/01_zprofile.zshrc
@@ -1,38 +1,21 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
-# 01_zprofile.zshrc: Make sure zpfofile files are read
+# 01_zprofile.zshrc: Make sure zprofile files are read
 
 [[ -z "$AXZSH_ZPROFILE_READ" ]] || return
 
-# No "zprofile" files have been read in already! So most probably this
-# ZSH instance hasn't been called from an ax-zsh enabled ZSH!
+# No "zprofile" (and "ax-io") stage files have been read in already, so looks
+# like this is a non-login shell instance but not a (direct) child of an AX-ZSH
+# enabled login shell! This can happen in graphical terminals not starting a
+# login shell, for example. So most probably some environment configuration is
+# missing and we have to make sure everything is set up properly by reading in
+# the "ax-io" and "zprofile" stages before continuing!
+[[ -n "$AXZSH_DEBUG" ]] && echo "» 01_zprofile.zshrc:"
 
 # Reset some environment variables, that could contain "garbage" ...
 unset PS1
 
-[[ -n "$AXZSH_DEBUG" ]] && echo "» 01_zprofile.zsh:"
-
-if [[ -r "$AXZSH/cache/zprofile.cache" ]]; then
-       # Cache file exists, use it!
-       [[ -n "$AXZSH_DEBUG" ]] \
-               && echo "   - Reading cache file \"$AXZSH/cache/zprofile.cache\" ..."
-       source "$AXZSH/cache/zprofile.cache"
-else
-       # No cache file, so read plugins manually. The "plugin_list" can be
-       # empty, when the "zshrc" stage has been read in using the cache file,
-       # but there is no cache file for the "zprofile" stage. In that case
-       # the "plugin_list" must be assembled right now (see "ax.zsh" file!):
-       if [[ -z "$plugin_list" ]]; then
-               typeset -U plugin_list
-               plugin_list=(
-                       "$AXZSH/core/"[0-5]*
-                       "$AXZSH/active_plugins/"*(N)
-                       "$AXZSH/core/"[6-9]*
-               )
-       fi
-       for plugin ($plugin_list); do
-               axzsh_load_plugin "$plugin" "zprofile"
-       done
-fi
+axzsh_handle_stage "01_zprofile.zshrc" "ax-io"
+axzsh_handle_stage "01_zprofile.zshrc" "zprofile"
 AXZSH_ZPROFILE_READ=2
 
-[[ -n "$AXZSH_DEBUG" ]] && echo "» 01_zprofile.zsh (end)"
+[[ -n "$AXZSH_DEBUG" ]] && echo "» 01_zprofile.zshrc (end)"