]> arthur.barton.de Git - ax-zsh.git/commitdiff
50_prompt: Don't export PS{1...4} and RPS{1|2} any more
authorAlexander Barton <alex@barton.de>
Mon, 2 Nov 2015 13:33:57 +0000 (14:33 +0100)
committerAlexander Barton <alex@barton.de>
Mon, 2 Nov 2015 13:33:57 +0000 (14:33 +0100)
Exporting the prompt environment variables fails with non-ZSH sub-shells,
and with AX-ZSH themes that relay on environment variables that aren't
exported (and plain ZSH doesn't export by default, so nobody can relay on
this anyway).

Now themes are initialized in the "zshrc" step (insetad of "zlogin").

core/50_prompt/50_prompt.zshrc
default_plugins/prompt/prompt.zlogin [deleted file]
default_plugins/prompt/prompt.zshrc [new file with mode: 0644]

index 39c47a395956621058c77723ba06e2f1f6a4f90e..6eb7f1278fcddfd8c599293cfcdcc9b854ed120c 100644 (file)
@@ -98,6 +98,3 @@ function ax_prompt() {
 # Options and defaults
 
 setopt PROMPT_SUBST
-
-export PS1 PS2 PS3 PS4
-export RPS1 RPS2
diff --git a/default_plugins/prompt/prompt.zlogin b/default_plugins/prompt/prompt.zlogin
deleted file mode 100644 (file)
index 5911418..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# AX-ZSH: Alex' Modular ZSH Configuration
-# prompt.zlogin: Setup default prompts
-
-[[ -r "$AXZSH/active_theme" ]] \
-       && source "$AXZSH/active_theme" \
-       || source "$AXZSH/themes/ax.axzshtheme"
diff --git a/default_plugins/prompt/prompt.zshrc b/default_plugins/prompt/prompt.zshrc
new file mode 100644 (file)
index 0000000..5911418
--- /dev/null
@@ -0,0 +1,6 @@
+# AX-ZSH: Alex' Modular ZSH Configuration
+# prompt.zlogin: Setup default prompts
+
+[[ -r "$AXZSH/active_theme" ]] \
+       && source "$AXZSH/active_theme" \
+       || source "$AXZSH/themes/ax.axzshtheme"