Merge 32275bd605 into 8df5c1b18b

- When uninstalling, if no original backup (.zshrc.pre-oh-my-zsh) exists,
  restore the current .zshrc with Oh My Zsh lines removed
- Prevents data loss for users who installed years ago on different machines
- Keeps the timestamped backup file for safety

Fixes #13156
Fixes #13328

plugins/last-working-dir/last-working-dir.plugin.zsh

@@ -23,8 +23,8 @@ lwd() {
 #
 # - This isn't the first time the plugin is loaded
 # - We're not in the $HOME directory (e.g. if terminal opened a different folder)
-[[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]] || return
-[[ "$PWD" == "$HOME" ]] || return
+[[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]] || return 0
+[[ "$PWD" == "$HOME" ]] || return 0
 
 if lwd 2>/dev/null; then
   ZSH_LAST_WORKING_DIRECTORY=1

tools/uninstall.sh

@@ -35,6 +35,12 @@ if [ -e "$ZSHRC_ORIG" ]; then
   echo "Your original zsh config was restored."
 else
   echo "No original zsh config found"
+  if [ -e "${ZSHRC_SAVE}" ]; then
+    echo "Restoring your current config and removing Oh My Zsh lines..."
+    grep -v 'source.*oh-my-zsh\.sh' "${ZSHRC_SAVE}" > ~/.zshrc
+    echo "Your config was restored with Oh My Zsh lines removed."
+    echo "Original file saved at: ${ZSHRC_SAVE}"
+  fi
 fi
 
 echo "Thanks for trying out Oh My Zsh. It's been uninstalled."