From f9d9fe6db40f1e17f9077f589f730b752bea41fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 6 Feb 2022 19:02:39 +0530
Subject: [PATCH] Shell integration: bash: Dont fail if an existing
 PROMPT_COMMAND ends with a semi-colon

Fixes #4645
---
 docs/changelog.rst                | 2 ++
 shell-integration/bash/kitty.bash | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 083de6361..df2e222d9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -105,6 +105,8 @@ Detailed list of changes
 
 - Linux: Fix rendering of emoji when using scalable fonts such as Segoe UI Emoji
 
+- Shell integration: bash: Dont fail if an existing PROMPT_COMMAND ends with a semi-colon (:iss:`4645`)
+
 0.24.2 [2022-02-03]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/shell-integration/bash/kitty.bash b/shell-integration/bash/kitty.bash
index fbf69caf9..be9766dc6 100644
--- a/shell-integration/bash/kitty.bash
+++ b/shell-integration/bash/kitty.bash
@@ -141,6 +141,8 @@ _ksi_main() {
     elif [[ $(builtin declare -p PROMPT_COMMAND 2> /dev/null) =~ 'declare -a PROMPT_COMMAND' ]]; then
         PROMPT_COMMAND+=("_ksi_prompt_command")
     else
+        PROMPT_COMMAND="${PROMPT_COMMAND%% }"
+        PROMPT_COMMAND="${PROMPT_COMMAND%%;}"
         PROMPT_COMMAND+="; _ksi_prompt_command"
     fi
 }