From 5c9a3d2f4f5cecc019b49d8fa3c151e547f8b139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 1 Feb 2023 21:19:55 +0100
Subject: [PATCH] fix(installer): don't use `$ZDOTDIR` in zshrc file if same as
 `$HOME`

Fixes #11471
---
 tools/install.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 4582ed03e..3ea12f8d4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -61,9 +61,9 @@ custom_zsh=${ZSH:+yes}
 zdot="${ZDOTDIR:-$HOME}"
 
 # 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
-ZSH="${ZSH:-${ZDOTDIR:+$ZDOTDIR/ohmyzsh}}"
+[ "$ZDOTDIR" = "$HOME" ] || ZSH="${ZSH:-${ZDOTDIR:+$ZDOTDIR/ohmyzsh}}"
 ZSH="${ZSH:-$HOME/.oh-my-zsh}"
 
 # Default settings
@@ -350,7 +350,9 @@ setup_zshrc() {
 
   # Modify $ZSH variable in .zshrc directory to use the literal $ZDOTDIR or $HOME
   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/|")
 
   sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > "$zdot/.zshrc-omztemp"