From 309a471e7706be0cedc880a73cf356a9c136f768 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 19 May 2022 17:10:51 -0400 Subject: [PATCH] Shorten /usr/bin to /bin for Haiku server compatibility --- bin/sshync.py | 5 ++--- bin/sshyp | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/sshync.py b/bin/sshync.py index a3c0d9d..41a968f 100755 --- a/bin/sshync.py +++ b/bin/sshync.py @@ -27,9 +27,8 @@ def get_titles_mods(_directory, _destination, _user_data): open(expanduser('~/.config/sshync/database'), 'a').write(str(_mod) + '\n') # remote fetching if _destination == 'r': - system(f"ssh -i '{_user_data[5]}' -p {_user_data[2]} {_user_data[0]}@{_user_data[1]} \"cd /usr/bin; python -c " - f"'import sshync; sshync.get_titles_mods(\"'\"{_user_data[4]}\"'\", \"'\"l\"'\", " - f"\"'\"{_user_data}\"'\")'\"") + system(f"ssh -i '{_user_data[5]}' -p {_user_data[2]} {_user_data[0]}@{_user_data[1]} \"cd /bin; python -c 'impo" + f"rt sshync; sshync.get_titles_mods(\"'\"{_user_data[4]}\"'\", \"'\"l\"'\", \"'\"{_user_data}\"'\")'\"") system(f"scp -pqs -P {_user_data[2]} -i '{_user_data[5]}' {_user_data[0]}@{_user_data[1]}:" f"'/home/{_user_data[0]}/.config/sshync/database' '{expanduser('~/.config/sshync/')}'") _titles, _sep, _mods = '*&^'.join(open(expanduser('~/.config/sshync/database')).readlines()).replace('\n', '')\ diff --git a/bin/sshyp b/bin/sshyp index 9a32ac1..ac7d2d0 100755 --- a/bin/sshyp +++ b/bin/sshyp @@ -317,7 +317,7 @@ def read_shortcut(): # shortcut to quickly read an entry def sync(): # calls sshync to sync changes to the user's server print('\nSyncing entries with the server device...\n') # check for deletions - system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c " f"'import sshypRemote; sshypRemote.deletion_check(\"'\"{client_device_name}\"'\")'\"") system(f"scp -pqs -P {port} -i '{path.expanduser('~/.ssh/sshyp')}' {username_ssh}@{ip}:'/home/{username_ssh}" f"/.config/sshyp/deletion_database' {path.expanduser('~/.config/sshyp/')}") @@ -345,7 +345,7 @@ def sync(): # calls sshync to sync changes to the user's server if silent_sync != 1: print('File does not exist locally.') # check for new folders - system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c " f"'import sshypRemote; sshypRemote.folder_check()'\"") system(f"scp -pqs -P {port} -i '{path.expanduser('~/.ssh/sshyp')}' {username_ssh}@{ip}:'/home/{username_ssh}" f"/.config/sshyp/folder_database' {path.expanduser('~/.config/sshyp/')}") @@ -432,7 +432,7 @@ def rename(): # renames an entry or folder f"{_new_name}'\"") else: move(f"{directory}{_entry_name}.gpg", f"{directory}{_new_name}.gpg") - system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c " f"'import sshypRemote; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"") @@ -602,7 +602,7 @@ def remove_data(): # deletes an entry from the server and flags it for local de except FileNotFoundError: print('\nAccess denied.\n') s_exit(1) - system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c " f"'import sshypRemote; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"")