From 23f598c1302868e7330d48bae129e1c905ddb557 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Fri, 7 Apr 2017 21:37:32 +0200 Subject: [PATCH] Debug mode: Don't test for ~/.axzsh.debug but for $AXZSH_DEBUG --- core/01_zprofile/01_zprofile.zshrc | 4 ++-- core/80_local_config/80_local_config.zlogin | 8 ++++---- core/80_local_config/80_local_config.zlogout | 8 ++++---- core/80_local_config/80_local_config.zprofile | 12 ++++++------ core/80_local_config/80_local_config.zshrc | 8 ++++---- core/99_zlogin/99_zlogin.zshrc | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/01_zprofile/01_zprofile.zshrc b/core/01_zprofile/01_zprofile.zshrc index b30e727..732318d 100644 --- a/core/01_zprofile/01_zprofile.zshrc +++ b/core/01_zprofile/01_zprofile.zshrc @@ -9,9 +9,9 @@ # Reset some environment variables, that could contain "garbage" ... unset PS1 -[[ -f "$HOME/.axzsh.debug" ]] && echo "» 01_zprofile.zsh:" +[[ -n "$AXZSH_DEBUG" ]] && echo "» 01_zprofile.zsh:" for plugin ($plugin_list); do axzsh_load_plugin "$plugin" "zprofile" done AXZSH_ZPROFILE_READ=2 -[[ -f "$HOME/.axzsh.debug" ]] && echo "» 01_zprofile.zsh (end)" +[[ -n "$AXZSH_DEBUG" ]] && echo "» 01_zprofile.zsh (end)" diff --git a/core/80_local_config/80_local_config.zlogin b/core/80_local_config/80_local_config.zlogin index a9f20b0..b6da569 100644 --- a/core/80_local_config/80_local_config.zlogin +++ b/core/80_local_config/80_local_config.zlogin @@ -2,13 +2,13 @@ # 80_local_config.zlogin: Read local configuration if [[ -r "$HOME/.zlogin.local" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zlogin.local:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zlogin.local:" source "$HOME/.zlogin.local" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zlogin.local (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zlogin.local (end)" fi if [[ -r "/var/lib/$HOST/zlogin" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zlogin:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zlogin:" source "/var/lib/$HOST/zlogin" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zlogin (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zlogin (end)" fi diff --git a/core/80_local_config/80_local_config.zlogout b/core/80_local_config/80_local_config.zlogout index 8c68644..e84cfcd 100644 --- a/core/80_local_config/80_local_config.zlogout +++ b/core/80_local_config/80_local_config.zlogout @@ -2,13 +2,13 @@ # 80_local_config.zlogout: Read local configuration if [[ -r "$HOME/.zlogout.local" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zlogout.local:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zlogout.local:" source "$HOME/.zlogout.local" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zlogout.local (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zlogout.local (end)" fi if [[ -r "/var/lib/$HOST/zlogout" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zlogout:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zlogout:" source "/var/lib/$HOST/zlogout" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zlogout (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zlogout (end)" fi diff --git a/core/80_local_config/80_local_config.zprofile b/core/80_local_config/80_local_config.zprofile index cb8ca14..e6a9430 100644 --- a/core/80_local_config/80_local_config.zprofile +++ b/core/80_local_config/80_local_config.zprofile @@ -2,17 +2,17 @@ # 80_local_config.zprofile: Read local configuration if [[ -r "$HOME/.zprofile.local" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zprofile.local:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zprofile.local:" source "$HOME/.zprofile.local" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zprofile.local (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zprofile.local (end)" fi if [[ -r "/var/lib/$HOST/zprofile" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zprofile:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zprofile:" source "/var/lib/$HOST/zprofile" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zprofile (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zprofile (end)" elif [[ -r "/var/lib/$HOST/profile" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/profile:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/profile:" source "/var/lib/$HOST/profile" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/profile (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/profile (end)" fi diff --git a/core/80_local_config/80_local_config.zshrc b/core/80_local_config/80_local_config.zshrc index 2b6d647..eb3afa2 100644 --- a/core/80_local_config/80_local_config.zshrc +++ b/core/80_local_config/80_local_config.zshrc @@ -2,13 +2,13 @@ # 80_local_config.zshrc: Read local configuration if [[ -r "$HOME/.zshrc.local" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zshrc.local:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zshrc.local:" source "$HOME/.zshrc.local" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» $HOME/.zshrc.local (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» $HOME/.zshrc.local (end)" fi if [[ -r "/var/lib/$HOST/zshrc" ]]; then - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zshrc:" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zshrc:" source "/var/lib/$HOST/zshrc" - [[ -f "$HOME/.axzsh.debug" ]] && echo "» /var/lib/$HOST/zshrc (end)" + [[ -n "$AXZSH_DEBUG" ]] && echo "» /var/lib/$HOST/zshrc (end)" fi diff --git a/core/99_zlogin/99_zlogin.zshrc b/core/99_zlogin/99_zlogin.zshrc index a2c5ca6..bdb106b 100644 --- a/core/99_zlogin/99_zlogin.zshrc +++ b/core/99_zlogin/99_zlogin.zshrc @@ -6,9 +6,9 @@ # No "zlogin" files have been read in already! So most probably this # ZSH instance hasn't been called from an ax-zsh enabled ZSH! -[[ -f "$HOME/.axzsh.debug" ]] && echo "» 99_zlogin.zsh:" +[[ -n "$AXZSH_DEBUG" ]] && echo "» 99_zlogin.zsh:" for plugin ($plugin_list); do axzsh_load_plugin "$plugin" "zlogin" done AXZSH_ZLOGIN_READ=2 -[[ -f "$HOME/.axzsh.debug" ]] && echo "» 99_zlogin.zsh (end)" +[[ -n "$AXZSH_DEBUG" ]] && echo "» 99_zlogin.zsh (end)" -- 2.39.2