From 0c55cb9621dd6c8e9344b9aa846296f4513b8cc6 Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Tue, 18 Nov 2025 06:32:03 +0530
Subject: [PATCH] Avoid wrecking pipestatus in Bash (#1141)

---
 templates/bash.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/bash.txt b/templates/bash.txt
index 8c96deb..f96edb0 100644
--- a/templates/bash.txt
+++ b/templates/bash.txt
@@ -56,10 +56,12 @@ function __zoxide_hook() {
 # Initialize hook.
 if [[ ${PROMPT_COMMAND:=} != *'__zoxide_hook'* ]]; then
     if [[ "$(declare -p PROMPT_COMMAND 2>&1)" == "declare -a"* ]]; then
-        PROMPT_COMMAND=(__zoxide_hook "${PROMPT_COMMAND[@]}")
+        PROMPT_COMMAND=("${PROMPT_COMMAND[@]}" __zoxide_hook)
     else
-        # shellcheck disable=SC2178
-        PROMPT_COMMAND="__zoxide_hook;${PROMPT_COMMAND#;}"
+        # shellcheck disable=SC2128,SC2178
+        PROMPT_COMMAND="${PROMPT_COMMAND%"${PROMPT_COMMAND##*[![:space:]]}"}"
+        # shellcheck disable=SC2128,SC2178
+        PROMPT_COMMAND="${PROMPT_COMMAND:+${PROMPT_COMMAND};}__zoxide_hook"
     fi
 fi