Commit 5c9a3d2f authored by Marc Cornellà's avatar Marc Cornellà

fix(installer): don't use `$ZDOTDIR` in zshrc file if same as `$HOME`

Fixes #11471
parent 27f31799
...@@ -61,9 +61,9 @@ custom_zsh=${ZSH:+yes} ...@@ -61,9 +61,9 @@ custom_zsh=${ZSH:+yes}
zdot="${ZDOTDIR:-$HOME}" zdot="${ZDOTDIR:-$HOME}"
# Default value for $ZSH # Default value for $ZSH
# a) if $ZDOTDIR is supplied: $ZDOTDIR/ohmyzsh # a) if $ZDOTDIR is supplied and not $HOME: $ZDOTDIR/ohmyzsh
# b) otherwise, $HOME/.oh-my-zsh # b) otherwise, $HOME/.oh-my-zsh
ZSH="${ZSH:-${ZDOTDIR:+$ZDOTDIR/ohmyzsh}}" [ "$ZDOTDIR" = "$HOME" ] || ZSH="${ZSH:-${ZDOTDIR:+$ZDOTDIR/ohmyzsh}}"
ZSH="${ZSH:-$HOME/.oh-my-zsh}" ZSH="${ZSH:-$HOME/.oh-my-zsh}"
# Default settings # Default settings
...@@ -350,7 +350,9 @@ setup_zshrc() { ...@@ -350,7 +350,9 @@ setup_zshrc() {
# Modify $ZSH variable in .zshrc directory to use the literal $ZDOTDIR or $HOME # Modify $ZSH variable in .zshrc directory to use the literal $ZDOTDIR or $HOME
omz="$ZSH" omz="$ZSH"
[ -z "$ZDOTDIR" ] || omz=$(echo "$omz" | sed "s|^$ZDOTDIR/|\$ZDOTDIR/|") if [ -n "$ZDOTDIR" ] && [ "$ZDOTDIR" != "$HOME" ]; then
omz=$(echo "$omz" | sed "s|^$ZDOTDIR/|\$ZDOTDIR/|")
fi
omz=$(echo "$omz" | sed "s|^$HOME/|\$HOME/|") omz=$(echo "$omz" | sed "s|^$HOME/|\$HOME/|")
sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > "$zdot/.zshrc-omztemp" sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > "$zdot/.zshrc-omztemp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment