From 7259a8732c0c43b7550c365148879c4bdc861043 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Tue, 26 Sep 2023 20:29:51 -0400
Subject: [PATCH] (MacOS) Port new clipboard behavior to MacOS

Former-commit-id: bd887c5ee6a75130b8c994034708ae7893764251
Former-commit-id: e1621ed1a986f731c8217d741fd84a42196cb4e9
---
 lib/sshyp.py           | 3 ++-
 port-jobs/CLIPBOARD.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/sshyp.py b/lib/sshyp.py
index b44e6ee..14974c0 100755
--- a/lib/sshyp.py
+++ b/lib/sshyp.py
@@ -566,7 +566,8 @@ def copy_data():
     elif uname()[0] == 'Darwin':
         run('pbcopy', stdin=Popen(('printf', _copy_subject.replace('\\', '\\\\').replace('%', '%%')), stdout=PIPE)
             .stdout)
-        Popen("sleep 30; printf '' | pbcopy", shell=True)
+        Popen(f"sleep 30; test \'{_hash.hexdigest() + 2 * ' ' + '-'}\' = \"$(printf \"$(pbpaste)\" | shasum -a 512)\" "
+              "&& printf '' | pbcopy", shell=True)
     # Termux (Android) clipboard detection
     elif isdir("/data/data/com.termux"):
         run(('termux-clipboard-set', _copy_subject))
diff --git a/port-jobs/CLIPBOARD.py b/port-jobs/CLIPBOARD.py
index e92b6de..f3b1e9b 100755
--- a/port-jobs/CLIPBOARD.py
+++ b/port-jobs/CLIPBOARD.py
@@ -16,7 +16,8 @@ if len(arguments) > 0:
     elif arguments[0] == 'MAC':
         replacement = """run('pbcopy', stdin=Popen(('printf', _copy_subject.replace('\\\\\\', '\\\\\\\\\\\\\\')
         .replace('%', '%%')), stdout=PIPE).stdout)
-    Popen("sleep 30; printf '' | pbcopy", shell=True)"""
+    Popen(f"sleep 30; test \\'{_hash.hexdigest() + 2 * ' ' + '-'}\\' = \\"$(printf \\"$(pbpaste)\\" | shasum -a 512)\\" "
+              "&& printf '' | pbcopy", shell=True)"""
     elif arguments[0] == 'HAIKU':
         replacement = """run(('clipboard', '-c', _copy_subject))
     Popen(f"sleep 30; test \\'{_hash.hexdigest() + 2 * ' ' + '-'}\\' = \\"$(printf \\"$(clipboard -p)\\" | sha512sum)\\" "