GitHubMirror/sshyp
1
0
Fork 0
mirror of https://github.com/rwinkhart/sshyp.git synced 2026-09-05 08:37:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed use of multiple versions of Powershell under WSL (now uses only system-provided executable)

Browse Source 
Former-commit-id: b804ff1921655a73423b67332385f7dbf5a20319
Former-commit-id: 8dfced454233d135877582617c12ec0615ba73ca
This commit is contained in:
RandyTheSilly
2023-05-25 09:38:20 -04:00
parent e594a625d9
commit d868476d35
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+1 -1
View File
@@ -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; pwsh.exe -c 'echo \"\" | Set-Clipboard'", shell=True) Popen("sleep 30; powershell.exe -c 'echo \"\" | Set-Clipboard'", shell=True)
# 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]))
port-jobs/CLIPBOARD.py
+1 -1
View File
@@ -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; pwsh.exe -c 'echo \\"\\" | Set-Clipboard'", shell=True)""" Popen("sleep 30; powershell.exe -c 'echo \\"\\" | Set-Clipboard'", shell=True)"""
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)