mirror of
https://github.com/rwinkhart/sshyp.git
synced 2026-08-28 04:46:34 -04:00
Fixed use of multiple versions of Powershell under WSL (now uses only system-provided executable)
Former-commit-id: b804ff1921655a73423b67332385f7dbf5a20319 Former-commit-id: 8dfced454233d135877582617c12ec0615ba73ca
This commit is contained in:
+1
-1
@@ -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; pwsh.exe -c 'echo \"\" | Set-Clipboard'", shell=True)
|
||||
Popen("sleep 30; powershell.exe -c 'echo \"\" | Set-Clipboard'", shell=True)
|
||||
# Wayland clipboard detection
|
||||
elif 'WAYLAND_DISPLAY' in environ:
|
||||
run(('wl-copy', _copy_line[_index]))
|
||||
|
||||
@@ -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; pwsh.exe -c 'echo \\"\\" | Set-Clipboard'", shell=True)"""
|
||||
Popen("sleep 30; powershell.exe -c 'echo \\"\\" | Set-Clipboard'", shell=True)"""
|
||||
elif arguments[0] == 'MAC':
|
||||
replacement = """run(['pbcopy'], stdin=Popen(['printf', _copy_line[_index].rstrip()\
|
||||
.replace('\\\\\\', '\\\\\\\\\\\\\\').replace('%', '%%')],stdout=PIPE).stdout)
|
||||
|
||||
Reference in New Issue
Block a user