From 657bc0291ff8c2b7f72f33581a7e8515bea3bbf2 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 25 May 2023 11:29:22 -0400 Subject: [PATCH] Fixed errors when clearing clipboard on Windows (WSL) Former-commit-id: 92b8baf923cccd20cd22cf6322c30ba1a0729cec Former-commit-id: 8ef2d4f2fe2e3e91b820b0e0577a7fc5bd9b90ca --- lib/sshyp.py | 2 +- port-jobs/CLIPBOARD.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sshyp.py b/lib/sshyp.py index 7877118..6d8709d 100755 --- a/lib/sshyp.py +++ b/lib/sshyp.py @@ -650,7 +650,7 @@ def copy_data(): # WSL clipboard detection if 'WSL_DISTRO_NAME' in environ: run(('powershell.exe', '-c', "Set-Clipboard '" + _copy_line[_index].replace("'", "''") + "'")) - Popen("sleep 30; powershell.exe -c 'echo \"\" | Set-Clipboard'", shell=True) + Popen("sleep 30; powershell.exe -c Set-Clipboard ''", shell=True, stdout=DEVNULL, stderr=DEVNULL) # Wayland clipboard detection elif 'WAYLAND_DISPLAY' in environ: run(('wl-copy', _copy_line[_index])) diff --git a/port-jobs/CLIPBOARD.py b/port-jobs/CLIPBOARD.py index 6e30cae..afef53e 100755 --- a/port-jobs/CLIPBOARD.py +++ b/port-jobs/CLIPBOARD.py @@ -10,7 +10,7 @@ if len(arguments) > 0: if arguments[0] == 'WSL': replacement = """run(['powershell.exe', '-c', "Set-Clipboard '" + _copy_line[_index].rstrip()\ .replace("'", "''") + "'"]) - Popen("sleep 30; powershell.exe -c 'echo \\"\\" | Set-Clipboard'", shell=True)""" + Popen("sleep 30; powershell.exe -c Set-Clipboard ''", shell=True, stdout=DEVNULL, stderr=DEVNULL)""" elif arguments[0] == 'MAC': replacement = """run(['pbcopy'], stdin=Popen(['printf', _copy_line[_index].rstrip()\ .replace('\\\\\\', '\\\\\\\\\\\\\\').replace('%', '%%')],stdout=PIPE).stdout)