dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 15:08:01 +00:00
Code Issues Releases Wiki Activity

Only export env variables in zprofile if unset

Browse Source 
As per [zsh documentation](https://zsh.sourceforge.io/Intro/intro_3.html) environment variables should be expected to be in `.zshenv` and not be overridden in `.zprofile`. This change modifies BROWSER (on darwin systems only), EDITOR, VISUAL, PAGER, LESS, and LESSOPEN to only use zprezto defaults if they were not previously set in the loading order.

See:
https://github.com/nix-community/home-manager/issues/2739
https://github.com/nix-community/home-manager/issues/2751
This commit is contained in:
Aaron Kanter 2022-03-12 19:16:35 -08:00 committed by Indrajit Raychaudhuri
parent 7ec1ecde3a
commit 15150085e6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runcoms/zprofile
View File

@ -9,7 +9,7 @@
# Browser # Browser
# #
if [[ "$OSTYPE" == darwin* ]]; then if [[ -z "$BROWSER" && "$OSTYPE" == darwin* ]]; then
export BROWSER='open' export BROWSER='open'
fi fi
@ -17,9 +17,15 @@ fi
# Editors # Editors
# #
if [[ -z "$EDITOR" ]]; then
export EDITOR='nano' export EDITOR='nano'
fi
if [[ -z "$VISUAL" ]]; then
export VISUAL='nano' export VISUAL='nano'
fi
if [[ -z "$PAGER" ]]; then
export PAGER='less' export PAGER='less'
fi
# #
# Language # Language
@ -54,10 +60,12 @@ path=(
# Set the default Less options. # Set the default Less options.
# Mouse-wheel scrolling has been disabled by -X (disable screen clearing). # Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
# Remove -X to enable it. # Remove -X to enable it.
if [[ -z "$LESS" ]]; then
export LESS='-g -i -M -R -S -w -X -z-4' export LESS='-g -i -M -R -S -w -X -z-4'
fi
# Set the Less input preprocessor. # Set the Less input preprocessor.
# Try both `lesspipe` and `lesspipe.sh` as either might exist on a system. # Try both `lesspipe` and `lesspipe.sh` as either might exist on a system.
if (( $#commands[(i)lesspipe(|.sh)] )); then if [[ -z "$LESSOPEN" && (( $#commands[(i)lesspipe(|.sh)] )) ]]; then
export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-" export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-"
fi fi