remove msys/cygwin support, bugfixes, and cleanup

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 7787a934df3697fd6120c99051a40ed0e73714c4..a709ce6efaf9b1520cce80985efc1160e6cc0953 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,17 +1,28 @@
-# load site-specific
+### load site-specific

 [[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 
 [[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 

-# manually source .zprofile if we're not a login shell and it's a good idea
-# see comments in .zprofile for rationale
+### fix broken term
+if (( $#terminfo == 0 )) {
+    [[ -o interactive ]] &&
+      print -P "%F{red}!!! Can't find terminfo for $TERM, using xterm%f"
+    TERM=xterm
+}
+
+### early zprofile sourcing
+# NOTE: see comments in .zprofile for additional rationale for this

 if [[ ! -o login ]] {
     if [[ -v _sev_olduser && $_sev_olduser != $USERNAME ]] {
         # set up some user-dependent stuff since we switched users
 if [[ ! -o login ]] {
     if [[ -v _sev_olduser && $_sev_olduser != $USERNAME ]] {
         # set up some user-dependent stuff since we switched users

+        # XXX: _sev_switched_users is no longer implemented

         _sev_switched_users= source ${ZDOTDIR:-~}/.zprofile
     } elif [[ $SHLVL == 1 ]] {
         # ensure profile is loaded for toplevel shells; should hopefully be 1
         # under Xorg or cron, which is where this would be most useful
         source ${ZDOTDIR:-~}/.zprofile
     }
         _sev_switched_users= source ${ZDOTDIR:-~}/.zprofile
     } elif [[ $SHLVL == 1 ]] {
         # ensure profile is loaded for toplevel shells; should hopefully be 1
         # under Xorg or cron, which is where this would be most useful
         source ${ZDOTDIR:-~}/.zprofile
     }

+} else {
+    # for convenience
+    cd ~

 }
 export _sev_olduser=$USERNAME
 
 }
 export _sev_olduser=$USERNAME