Backport /lib/sshyp fix

Former-commit-id: 21f1705 Former-commit-id: 56ccd20
rwinkhart · Jun 8, 2023 · 5cd50c7 · 5cd50c7
1 parent c48722f
commit 5cd50c7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/sshync.py b/lib/sshync.py
@@ -68,7 +68,7 @@ def get_local_data(_directory, _device):
 def remote_list_fetch(_user_data):
     try:
         _remote_data = run(['ssh', '-i', _user_data[5], '-p', _user_data[2], f"{_user_data[0]}@{_user_data[1]}",
-                            f'cd /lib/sshyp; python3 -c \'from sshync import remote_list_gen; remote_list_gen'
+                            f'cd /usr/lib/sshyp; python3 -c \'from sshync import remote_list_gen; remote_list_gen'
                             f'("{_user_data[6]}", "{_user_data[4]}")\''], stdout=PIPE, text=True, check=True
                            ).stdout.split('\x1d')
     except CalledProcessError:

diff --git a/lib/sshyp.py b/lib/sshyp.py
@@ -653,7 +653,7 @@ def rename():
         _folder_disabler = True
     if not ssh_error and not _folder_disabler:
         run(['ssh', '-i', f"{home}/.ssh/sshyp", '-p', port, f"{username_ssh}@{ip}",
-             f'cd /lib/sshyp; python3 -c \'from sshync import delete; delete("{entry_name}", "remotely")\''])
+             f'cd /usr/lib/sshyp; python3 -c \'from sshync import delete; delete("{entry_name}", "remotely")\''])
 
 
 # edits the contents of an entry
@@ -772,7 +772,7 @@ def remove_data():
     determine_decrypt(f"{home}/.config/sshyp/lock.gpg", None, None)
     if not ssh_error:
         run(['ssh', '-i', f"{home}/.ssh/sshyp", '-p', port, f"{username_ssh}@{ip}",
-             f'cd /lib/sshyp; python3 -c \'from sshync import delete; delete("{entry_name}", "remotely")\''])
+             f'cd /usr/lib/sshyp; python3 -c \'from sshync import delete; delete("{entry_name}", "remotely")\''])
     else:
         offline_delete(entry_name, 'locally')
 

diff --git a/share/doc/sshyp/changelog b/share/doc/sshyp/changelog
@@ -19,6 +19,7 @@ fixes:
     for the time being
 - backported fix for syncing over IPv6
 - backported fix for multiple versions of Powershell being called under WSL
+- backported fix for checking /lib/sshyp instead of /usr/lib/sshyp
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>