From 01433503c2a474c049fa56d792ebfd9274e683cc Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 25 Jun 2025 21:33:17 +0200
Subject: [PATCH] fix(rbw): reset clipboard in `rbwpw` only in the last
 invocation (#13185)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous behavior would reset the clipboard after 20 seconds always, even
if the `rbwpw` function was called again in between. This commit fixes that
behavior.

Co-authored-by: Marc Cornellà <marc@mcornella.com>
---
 plugins/rbw/rbw.plugin.zsh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index b6cecf8b4..0b55e6e5f 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -29,9 +29,24 @@ function rbwpw {
     echo "$service not found"
     return 1
   fi
+
+  # Generate a random identifier for this call to rbwpw
+  # so we can check if the clipboard content has changed
+  local _random="$RANDOM" _cache="$ZSH_CACHE_DIR/.rbwpw"
+  echo -n "$_random" > "$_cache"
+
+  # Use clipcopy to copy the password to the clipboard
   echo -n $pw | clipcopy
   echo "password for $service copied!"
-  {sleep 20 && clipcopy </dev/null 2>/dev/null} &|
+
+  # Clear the clipboard after 20 seconds, but only if the clipboard hasn't
+  # changed (if rbwpw hasn't been called again)
+  {
+    sleep 20 \
+    && [[ "$(<"$_cache")" == "$_random" ]] \
+    && clipcopy </dev/null 2>/dev/null \
+    && command rm -f "$_cache" &>/dev/null
+  } &|
 }
 
 function _rbwpw {