mirror of
https://github.com/rwinkhart/sshyp.git
synced 2026-09-02 15:17:18 -04:00
Fixed errors when clearing clipboard on Windows (WSL)
Former-commit-id: 92b8baf923cccd20cd22cf6322c30ba1a0729cec Former-commit-id: 8ef2d4f2fe2e3e91b820b0e0577a7fc5bd9b90ca
This commit is contained in:
+1
-1
@@ -650,7 +650,7 @@ def copy_data():
|
|||||||
# WSL clipboard detection
|
# WSL clipboard detection
|
||||||
if 'WSL_DISTRO_NAME' in environ:
|
if 'WSL_DISTRO_NAME' in environ:
|
||||||
run(('powershell.exe', '-c', "Set-Clipboard '" + _copy_line[_index].replace("'", "''") + "'"))
|
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
|
# Wayland clipboard detection
|
||||||
elif 'WAYLAND_DISPLAY' in environ:
|
elif 'WAYLAND_DISPLAY' in environ:
|
||||||
run(('wl-copy', _copy_line[_index]))
|
run(('wl-copy', _copy_line[_index]))
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ if len(arguments) > 0:
|
|||||||
if arguments[0] == 'WSL':
|
if arguments[0] == 'WSL':
|
||||||
replacement = """run(['powershell.exe', '-c', "Set-Clipboard '" + _copy_line[_index].rstrip()\
|
replacement = """run(['powershell.exe', '-c', "Set-Clipboard '" + _copy_line[_index].rstrip()\
|
||||||
.replace("'", "''") + "'"])
|
.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':
|
elif arguments[0] == 'MAC':
|
||||||
replacement = """run(['pbcopy'], stdin=Popen(['printf', _copy_line[_index].rstrip()\
|
replacement = """run(['pbcopy'], stdin=Popen(['printf', _copy_line[_index].rstrip()\
|
||||||
.replace('\\\\\\', '\\\\\\\\\\\\\\').replace('%', '%%')],stdout=PIPE).stdout)
|
.replace('\\\\\\', '\\\\\\\\\\\\\\').replace('%', '%%')],stdout=PIPE).stdout)
|
||||||
|
|||||||
Reference in New Issue
Block a user