diff --git a/bin/sshync.py b/bin/sshync.py index 8d75726..a3c0d9d 100755 --- a/bin/sshync.py +++ b/bin/sshync.py @@ -27,8 +27,9 @@ 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]} \"python -c 'import sshync" - f"; sshync.get_titles_mods(\"'\"{_user_data[4]}\"'\", \"'\"l\"'\", \"'\"{_user_data}\"'\")'\"") + 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"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 f134632..857efa5 100755 --- a/bin/sshyp +++ b/bin/sshyp @@ -5,7 +5,7 @@ from os import environ, listdir, path, remove, system, uname, walk from pathlib import Path import random -from shutil import copy, get_terminal_size, move, rmtree +from shutil import get_terminal_size, move, rmtree import sshync import string from subprocess import Popen @@ -157,8 +157,6 @@ def tweak(): # runs configuration wizard if _device_type.lower() == 's': open(path.expanduser('~/.config/sshyp/sshyp-device'), 'w').write(_device_type) Path(path.expanduser('~/.config/sshyp/deleted')).mkdir(0o700, parents=True, exist_ok=True) - copy('/usr/bin/sshync.py', path.expanduser('~/')) - copy('/usr/bin/sshypRemote.py', path.expanduser('~/sshypRemote.py')) print('\nMake sure the ssh service is running and properly configured.\n\nConfiguration complete!\n') s_exit(0) else: @@ -319,8 +317,8 @@ 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} \"python -c 'import sshypRemote" - f"; sshypRemote.deletion_check(\"'\"{client_device_name}\"'\")'\"") + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + f"'import sshypRemote; sshypRemote.deletion_check(\"'\"{client_device_name}\"'\")'\"") system(f"sftp -p -q -i '{path.expanduser('~/.ssh/sshyp')}' -P {port} {username_ssh}@{ip}:" f"'/home/{username_ssh}/.config/sshyp/deletion_database' {path.expanduser('~/.config/sshyp/')}") try: @@ -347,8 +345,8 @@ 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} \"python -c 'import sshypRemote" - f"; sshypRemote.folder_check()'\"") + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + f"'import sshypRemote; sshypRemote.folder_check()'\"") system(f"sftp -p -q -i '{path.expanduser('~/.ssh/sshyp')}' -P {port} {username_ssh}@{ip}:" f"'/home/{username_ssh}/.config/sshyp/folder_database' {path.expanduser('~/.config/sshyp/')}") try: @@ -434,8 +432,8 @@ 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} \"python -c 'import sshypRemote; " - f"sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"") + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + f"'import sshypRemote; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"") def edit(): # edits the contents of an entry @@ -604,8 +602,8 @@ 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} \"python -c 'import sshypRemote" - f"; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"") + system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /usr/bin; python -c " + f"'import sshypRemote; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"") if __name__ == "__main__":