Update README.md

README.md

@@ -1,5 +1,5 @@
 # sshyp
-A very simple self-hosted, synchronized password manager for UNIX systems (currently Haiku/Linux). Alternative to (and compatible with) pass/password-store.
+A very simple self-hosted, synchronized password manager for UNIX(-like) systems (currently Haiku/FreeBSD/Linux). Alternative to (and compatible with) pass/password-store.
 
 Compatible with entries created by pass/password-store.
 
@@ -22,7 +22,7 @@ What sshyp can do:
 - generate new, secure passwords to the user's choice in length and complexity
 - securely sync said passwords and notes seamlessly between devices
 - everything above with entries created by pass/password-store!
-- everything above on Haiku, Linux, and Termux (an Android terminal emulator)!
+- everything above on Haiku, FreeBSD, Linux, and Termux (an Android terminal emulator)!
 
 What sshyp will likely do:
 
@@ -31,7 +31,7 @@ What sshyp will likely do:
 
 What sshyp definitely won't do:
 
-- Non-UNIX support, e.g. Windows (I'd be happy to link to third-party ports, if someone were to make them)
+- Non-UNIX(-like) support, e.g. Windows (I'd be happy to link to third-party ports, if someone were to make them)
 
 # Installation
 Arch Linux (all ISAs)
@@ -46,7 +46,7 @@ cd sshyp
 makepkg -si
 ```
 
-Pre-built packages exist for Haiku, Arch Linux, Debian Linux, and Termux. These can be downloaded from the releases page.
+Pre-built packages exist for Haiku, FreeBSD, Arch Linux, Debian Linux, Red Hat Linux, and Termux. These can be downloaded from the releases page.
 
 # Building
 Since sshyp is written entirely in Python, it doesn't need to be compiled. It does, however, need to be packaged for installation.
@@ -59,11 +59,13 @@ cd sshyp
 ./package.sh
 ```
 
-The packaging script has been tested on Arch Linux with dpkg as a dependency for Debian and Termux packaging.
+The packaging script has been tested on Arch Linux with "dpkg" as a dependency for Debian and Termux packaging and "freebsd-pkg" as a dependency for FreeBSD packaging.
+
+Haiku packaging must be done from within Haiku.
 
 The AUR version and the packages attatched to the release tags were already packaged using this script.
 
-Currently, the script can create packages for Haiku, Arch Linux (PKGBUILD), Debian Linux, Termux, and generic. Packaging for other systems coming soon.
+Currently, the script can create packages for Haiku, FreeBSD, Arch Linux (PKGBUILD), Debian Linux, Red Hat Linux, Termux, and generic. Packaging for other systems coming soon.
 
 # Usage
 Upon initial installation (on both the server and client devices), be sure to run:

bin/sshync.py

@@ -61,7 +61,7 @@ def get_profile(_profile_dir):
     try:
         _profile_data = open(_profile_dir).readlines()
     except (FileNotFoundError, IndexError):
-        print('\nEither the profile does not exist, or it is corrupted.\n')
+        print('\n\u001b[38;5;9merror: the profile does not exist or is corrupted.\u001b[0m\n')
         _profile_data = None
         s_exit(1)
     # extract data from profile

bin/sshyp

@@ -8,7 +8,7 @@ import random
 from shutil import get_terminal_size, move, rmtree
 import sshync
 import string
-from subprocess import Popen
+from subprocess import Popen, PIPE, STDOUT
 from sys import argv, exit as s_exit
 from textwrap import fill
 
@@ -38,7 +38,7 @@ def entry_list_gen():  # generates and prints a list of all folders and entries
     for _root, _directories, _files in walk(path.expanduser('~/.password-pasture')):
         for _dir in sorted(_directories):
             _inner_dir = f"{_root.replace(path.expanduser('~/.password-pasture'), '')}/{_dir}"
-            print(f"\n\u001b[38;5;15;48;5;238m{_inner_dir}/\u001b[0m")
+            print(f"\u001b[38;5;15;48;5;238m{_inner_dir}/\u001b[0m")
             _entry_list, _color_alternator = [], 1
             for _s_root, _s_directories, _s_files in walk(path.expanduser(f"~/.password-pasture{_inner_dir}")):
                 for _entry in sorted(_s_files):
@@ -56,7 +56,7 @@ def entry_list_gen():  # generates and prints a list of all folders and entries
             try:
                 print(fill(' '.join(_entry_list), width=_width) + '\n')
             except ValueError:
-                print('\u001b[38;5;208m-empty directory!-\u001b[0m\n')
+                print('\u001b[38;5;9m-empty directory-\u001b[0m\n')
 
 
 def entry_reader(_decrypted_entry):
@@ -65,14 +65,14 @@ def entry_reader(_decrypted_entry):
     for _num in range(len(_entry_lines)):
         try:
             if _num == 0 and _entry_lines[1] != '\n':
-                print(f"\u001b[38;5;0;48;5;15mUsername:\u001b[0m\n{_entry_lines[1]}")
+                print(f"\u001b[38;5;15;48;5;238musername:\u001b[0m\n{_entry_lines[1]}")
             elif _num == 1 and _entry_lines[0] != '\n':
-                print(f"\u001b[38;5;0;48;5;15mPassword:\u001b[0m\n{_entry_lines[0]}")
+                print(f"\u001b[38;5;15;48;5;238mpassword:\u001b[0m\n{_entry_lines[0]}")
             elif _num == 2 and _entry_lines[2] != '\n':
-                print(f"\u001b[38;5;0;48;5;15mURL:\u001b[0m\n{_entry_lines[_num]}")
+                print(f"\u001b[38;5;15;48;5;238murl:\u001b[0m\n{_entry_lines[_num]}")
             elif _num >= 3 and _entry_lines[_num] != '\n' and _notes_flag != 1:
                 _notes_flag = 1
-                print('\u001b[38;5;0;48;5;15mNotes:\u001b[0m\n' + _entry_lines[_num].replace('\n', ''))
+                print('\u001b[38;5;15;48;5;238mnotes:\u001b[0m\n' + _entry_lines[_num].replace('\n', ''))
             elif _num >= 3 and _notes_flag == 1:
                 print(_entry_lines[_num].replace('\n', ''))
             if _notes_flag == 1:
@@ -82,7 +82,7 @@ def entry_reader(_decrypted_entry):
                     print()
         except IndexError:
             if _num == 0:
-                print(f"\u001b[38;5;0;48;5;15mPassword:\u001b[0m\n{_entry_lines[0]}")
+                print(f"\u001b[38;5;15;48;5;238mpassword:\u001b[0m\n{_entry_lines[0]}")
 
 
 def replace_line(file_name, line_num, text):  # replaces text in a given line with different text
@@ -91,6 +91,22 @@ def replace_line(file_name, line_num, text):  # replaces text in a given line wi
     open(file_name, 'w').writelines(_lines)
 
 
+def entry_name_fetch(_entry_name_location):
+    if type(_entry_name_location) == str:
+        entry_list_gen()
+        _entry_name = str(input(_entry_name_location))
+    elif _entry_name_location == 0:
+        _entry_name = argument
+    else:
+        _entry_name_split = argument.split(' ')
+        del _entry_name_split[:_entry_name_location]
+        _entry_name = ' '.join(_entry_name_split)
+    if _entry_name.startswith('/'):
+        return _entry_name.replace('/', '', 1)
+    else:
+        return _entry_name
+
+
 def shm_gen():  # generates a random temporary folder for security and returns random names for the folder and temp file
     _shm_folder_gen = ''.join(random.SystemRandom().choice(string.ascii_letters + string.digits)
                               for _ in range(random.randint(10, 30)))
@@ -114,11 +130,11 @@ def pass_gen():
         if __special < __min_special:
             __gen = _pass_gen_function(__complexity, __length)
         return __gen
-    _length = int(input('How many characters should be in the password? '))
+    _length = int(input('password length: '))
     if _length > 840:
         _length = 840
-        print('\n\u001b[38;5;208mPassword length has been limited to the maximum of 840 characters.\u001b[0m\n')
+        print('\n\u001b[38;5;9mpassword length has been limited to the maximum of 840 characters\u001b[0m\n')
-    _complexity = str(input('Should the password be simple (for compatibility) or complex (for security)? (s/C) '))
+    _complexity = str(input('password complexity - simple (for compatibility) or complex (for security)? (s/C) '))
     _gen = _pass_gen_function(_complexity, _length)
     return _gen
 
@@ -129,6 +145,18 @@ def encrypt(_shm_folder, _shm_entry, _location):
     rmtree(f"{tmp_dir}{_shm_folder}")
 
 
+def decrypt(_entry_dir, _shm_folder, _shm_entry):
+    if _shm_folder == 0 and _shm_entry == 0:
+        _command = f"{gpg} -qd --output /dev/null {path.expanduser('~/.config/sshyp/lock.gpg')}"
+    else:
+        _command = f"{gpg} -qd --output {tmp_dir}{_shm_folder}/{_shm_entry} {_entry_dir}.gpg"
+    _output = Popen(_command, shell=True, stdout=PIPE, stderr=STDOUT, close_fds=True)
+    _block = _output.communicate()[0].strip()
+    if _output.returncode == 2:
+        print(f"\n\u001b[38;5;9merror: could not decrypt - ensure the correct gpg key is present\u001b[0m\n")
+        s_exit(1)
+
+
 def edit_note(_shm_folder, _shm_entry):
     lines = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}").readlines()
     open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(lines[0:3])
@@ -138,6 +166,21 @@ def edit_note(_shm_folder, _shm_entry):
     open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'a').write(edit_notes)
 
 
+def copy_name_check(_port, _username_ssh, _ip, _client_device_name):
+    _command = f"ssh -o ConnectTimeout=3 -i '{path.expanduser('~/.ssh/sshyp')}' -p {_port} {_username_ssh}@{_ip} " \
+               f"\"touch '/home/{_username_ssh}/.config/sshyp/devices/{_client_device_name}'\""
+    _output = Popen(_command, shell=True, stdout=PIPE, stderr=STDOUT, close_fds=True)
+    _block = _output.communicate()[0].strip()
+    if _output.returncode != 0:
+        print('\n\u001b[38;5;9mwarning: ssh connection could not be made - ensure the public key (~/.ssh/sshyp.pub) is '
+              'registered on the remote server and that the entered ip, port, and username are correct\n\nsyncing '
+              'functionality will be disabled until this is addressed\u001b[0m\n')
+        open(path.expanduser('~/.config/sshyp/ssh-error'), 'w').write('1')
+        return 1
+    else:
+        open(path.expanduser('~/.config/sshyp/ssh-error'), 'w').write('0')
+        return 0
+
 # argument-specific functions
 
 
@@ -153,11 +196,11 @@ def tweak():  # runs configuration wizard
         else:
             system(f"ln -s /dev/shm {path.expanduser('~/.config/sshyp/tmp')}")
     # device type configuration
-    _device_type = input('\nIs this installation for a client or for a server? (C/s) ')
+    _device_type = input('\nclient or server installation? (C/s) ')
     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)
-        print('\nMake sure the ssh service is running and properly configured.\n\nConfiguration complete!\n')
+        print('\nmake sure the ssh service is running and properly configured\n\nconfiguration complete\n')
         s_exit(0)
     else:
         # device type configuration
@@ -165,12 +208,12 @@ def tweak():  # runs configuration wizard
         open(path.expanduser('~/.config/sshyp/sshyp-device'), 'w').write(_device_type)
 
         # gpg configuration
-        _gpg_id = input('\nsshyp requires the use of a unique gpg key. Do you already have one that you are '
+        _gpg_id = input('\nsshyp requires the use of a unique gpg key - do you already have one that you are '
-                        'willing to use? (y/N)')
+                        'willing to use? (y/N) ')
         if _gpg_id.lower() != 'y':
-            print('\nA unique gpg key has been generated for you.')
+            print('\na unique gpg key has been generated for you.')
             system(f"{gpg} --full-generate-key")
-        _gpg_id = str(input('\nPlease input the ID of your gpg key: '))
+        _gpg_id = str(input('\nplease input the id of your gpg key: '))
         open(path.expanduser('~/.config/sshyp/sshyp-gpg'), 'w').write(_gpg_id + '\n')
 
         # lock file generation
@@ -179,24 +222,23 @@ def tweak():  # runs configuration wizard
         remove(f"{path.expanduser('~/.config/sshyp')}/lock")
 
         # ssh key configuration
-        _ssh_gen = (input('\nMake sure the ssh service on the remote server is running and properly configured.'
+        _ssh_gen = (input('\nmake sure the ssh service on the remote server is running and properly configured'
-                          '\n\nSync support requires a unique ssh key. Would you like to have this automatically '
+                          '\n\nsync support requires a unique ssh key - would you like to have this automatically '
                           'generated? (Y/n) '))
         if _ssh_gen.lower() != 'n':
             if uname()[0] == 'Haiku':
                 Path(f"{path.expanduser('~')}/.ssh").mkdir(0o700, exist_ok=True)
             system('ssh-keygen -t ed25519 -f ~/.ssh/sshyp')
         else:
-            print(f"\nEnsure that the key file you are using is located at {path.expanduser('~/.ssh/sshyp')}")
+            print(f"\nensure that the key file you are using is located at {path.expanduser('~/.ssh/sshyp')}")
 
         # ssh ip+port configuration
-        print('\nExample input: 10.10.10.10:9999\n')
+        _ip_port = str(input('\nexample input: 10.10.10.10:9999\n\nip and ssh port of the remote server: '))
-        _ip_port = str(input('What is the IP and ssh port of the remote server? '))
         _ip, _sep, _port = _ip_port.partition(':')
 
         # ssh user configuration
-        _username_ssh = str(input('\nWhat is the username of the remote server? '))
+        _username_ssh = str(input('\nusername of the remote server: '))
-        print(f"\nEntry directory: /home/{_username_ssh}/.password-pasture/")
+        print(f"\nentry directory: /home/{_username_ssh}/.password-pasture/")
 
         # sshync profile generation
         sshync.make_profile(path.expanduser('~/.config/sshyp/sshyp.sshync'),
@@ -206,23 +248,22 @@ def tweak():  # runs configuration wizard
         # device name configuration
         for _name in listdir(path.expanduser('~/.config/sshyp/devices')):  # remove existing device name
             remove(f"{path.expanduser('~/.config/sshyp/devices/')}{_name}")
-        print('\nIMPORTANT: This name MUST be unique amongst your client devices. '
+        print('\n\u001b[4;1mimportant:\u001b[0m This name \u001b[4;1mmust\u001b[0m be unique amongst your client '
-              '\nThis is used to keep track of which devices have up-to-date databases.\n')
+              'devices\n\nthis is used to keep track of which devices have up-to-date databases.\n')
-        _client_device_name = str(input('What would you like to name this device? '))
+        _client_device_name = str(input('device name: '))
         open(f"{path.expanduser('~/.config/sshyp/devices/')}{_client_device_name}", 'w')
-        system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {_port} {_username_ssh}@{_ip} "
+        copy_name_check(_port, _username_ssh, _ip, _client_device_name)
-               f"\"touch '/home/{_username_ssh}/.config/sshyp/devices/{_client_device_name}'\"")
 
-        print('\nConfiguration complete!\n')
+        print('\nconfiguration complete\n')
 
 
 def print_info():  # prints help text based on argument
-    if argument == 'help' or argument == '--help' or argument == '-h':
+    if argument_list[0] == 'help' or argument_list[0] == '--help' or argument_list[0] == '-h':
-        print('\n\u001b[38;5;0;48;5;15msshyp  Copyright (C) 2021-2022  Randall Winkhart\u001b[0m\n')
+        print('\n\u001b[1msshyp  copyright (c) 2021-2022  randall winkhart\u001b[0m\n')
-        print("This is free software, and you are welcome to redistribute it under certain conditions;\nthis program "
+        print("this is free software, and you are welcome to redistribute it under certain conditions;\nthis program "
-              "comes with ABSOLUTELY NO WARRANTY;\ntype `sshyp license' for details.")
+              "comes with absolutely no warranty;\ntype `sshyp license' for details")
-        print('\n\u001b[38;5;15;48;5;238mUSAGE: sshyp [OPTION [FLAG] [<entry name>]] | [/<entry name>]\u001b[0m\n')
+        print('\n\u001b[1musage:\u001b[0m sshyp [option [flag] [<entry name>]] | [/<entry name>]\n')
-        print('\u001b[38;5;0;48;5;15mOptions:\u001b[0m')
+        print('\u001b[1moptions:\u001b[0m')
         print('help/--help/-h           bring up this menu')
         print('version/-v               display sshyp version info')
         print('tweak                    configure sshyp')
@@ -232,98 +273,104 @@ def print_info():  # prints help text based on argument
         print('copy                     copy details of an entry to your clipboard')
         print('shear/-rm                delete an existing entry')
         print('sync/-s                  manually sync the entry directory via sshync\n')
-        print('\u001b[38;5;0;48;5;15mFlags:\u001b[0m')
+        print('\u001b[1mflags:\u001b[0m')
-        print('\u001b[38;5;15;48;5;238madd:\u001b[0m')
+        print('add:')
         print(' password/-p             add a password entry')
         print(' note/-n                 add a note entry')
         print(' folder/-f               add a new folder for entries')
-        print('\u001b[38;5;15;48;5;238medit:\u001b[0m')
+        print('edit:')
         print(' rename/relocate/-r      rename or relocate an entry')
         print(' username/-u             change the username of an entry')
         print(' password/-p             change the password of an entry')
         print(' note/-n                 change the note attached to an entry')
         print(' url/-l                  change the url attached to an entry')
-        print('\u001b[38;5;15;48;5;238mcopy:\u001b[0m')
+        print('copy:')
         print(' username/-u             copy the username of an entry to your clipboard')
         print(' password/-p             copy the password of an entry to your clipboard')
-        print(' url/-l                  copy the URL of an entry to your clipboard')
+        print(' url/-l                  copy the url of an entry to your clipboard')
         print(' note/-n                 copy the note of an entry to your clipboard')
-        print('\u001b[38;5;15;48;5;238mgen:\u001b[0m')
+        print('gen:')
         print(' update/-u               generate a password for an existing entry\n')
-        print("\u001b[38;5;0;48;5;15mTip:\u001b[0m You can quickly read an entry with 'sshyp /<entry name>'!")
+        print("\u001b[1mtip:\u001b[0m you can quickly read an entry with 'sshyp /<entry name>'")
-    elif argument == 'version' or argument == '-v':
+    elif argument_list[0] == 'version' or argument_list[0] == '-v':
-        print('\n\u001b[38;5;0;48;5;15m////////////////////////////////////////////////////////\u001b[0m')
+        print('\nsshyp is a simple, self-hosted, sftp-synchronized password manager\nfor unix(-like) systems (currently'
-        print('\u001b[38;5;0;48;5;15m/\u001b[38;5;15;48;5;238m                                                      '
+              ' haiku/linux/termux)\n\nsshyp is a viable alternative to (and compatible with) pass/password-store\n')
-              '\u001b[38;5;0;48;5;15m/\u001b[0m')
+        print("                ..       \u001b[38;5;9m♥♥ ♥♥\u001b[0m       ..\n         .''.''/()\\     \u001b[38;5;13m"
-        print('\u001b[38;5;0;48;5;15m/\u001b[38;5;15;48;5;238m   \u001b[38;5;0;48;5;15msshyp  Copyright (C) 2021-2022  '
+              "♥♥♥♥♥♥♥\u001b[0m     /()\\''.''.\n        *       :        \u001b[38;5;9m♥♥♥♥♥\u001b[0m        :       *"
-              'Randall Winkhart\u001b[38;5;15;48;5;238m   \u001b[38;5;0;48;5;15m/\u001b[0m')
+              "\n         `..'..'          \u001b[38;5;13m♥♥♥\u001b[0m          `..'..'\n         //   \\\\           "
-        print('\u001b[38;5;0;48;5;15m/\u001b[38;5;15;48;5;238m                                                      '
+              "\u001b[38;5;9m♥\u001b[0m           //   \\\\")
-              '\u001b[38;5;0;48;5;15m/\u001b[0m')
+        print('\u001b[38;5;7;48;5;8m<><><><><><><><><><><><><><><><><><><><><><><><><><><><>\u001b[0m')
-        print('\u001b[38;5;0;48;5;15m/\u001b[38;5;15;48;5;238m                    \u001b[38;5;0;48;5;15mVersion 1.0.0'
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m                                                      '
-              '\u001b[38;5;15;48;5;238m                     \u001b[38;5;0;48;5;15m/\u001b[0m')
+              '\u001b[38;5;7;48;5;8m/\u001b[0m')
-        print('\u001b[38;5;0;48;5;15m/\u001b[38;5;15;48;5;238m             \u001b[38;5;0;48;5;15mThe Polished Trotters '
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m   \u001b[38;5;15;48;5;8msshyp  copyright (c) 2021-2022  '
-              'Update\u001b[38;5;15;48;5;238m             \u001b[38;5;0;48;5;15m/\u001b[0m')
+              'randall winkhart\u001b[38;5;15;48;5;15m   \u001b[38;5;7;48;5;8m/\u001b[0m')
-        print('\u001b[38;5;0;48;5;15m/\u001b[38;5;15;48;5;238m                                                      '
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m                                                      '
-              '\u001b[38;5;0;48;5;15m/\u001b[0m')
+              '\u001b[38;5;7;48;5;8m/\u001b[0m')
-        print('\u001b[38;5;0;48;5;15m////////////////////////////////////////////////////////\u001b[0m\n')
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m                    \u001b[38;5;15;48;5;8mversion 1.0.0'
-    elif argument == 'license':
+              '\u001b[38;5;15;48;5;15m                     \u001b[38;5;7;48;5;8m/\u001b[0m')
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m             \u001b[38;5;15;48;5;8mthe polished trotters '
+              'update\u001b[38;5;15;48;5;15m             \u001b[38;5;7;48;5;8m/\u001b[0m')
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m                                                      '
+              '\u001b[38;5;7;48;5;8m/\u001b[0m')
+        print('\u001b[38;5;7;48;5;8m<><><><><><><><><><><><><><><><><><><><><><><><><><><><>\u001b[0m\n')
+        print('see https://github.com/rwinkhart/sshyp for more information\n')
+    elif argument_list[0] == 'license':
         print('\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU '
               'General\nPublic License as published by the Free Software Foundation, either version 3 of the License,'
               '\nor (at your option) any later version.\n\nThis program is distributed in the hope that it will be '
               'useful, but WITHOUT ANY WARRANTY;\nwithout even the implied warranty of MERCHANTABILITY or FITNESS FOR A'
               ' PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.'
               '\n\nhttps://opensource.org/licenses/GPL-3.0\n')
-    elif argument == 'add':
+    elif argument_list[0] == 'add':
-        print('\n\u001b[38;5;15;48;5;238mUSAGE: sshyp add {FLAG {<entry name>}}\u001b[0m\n')
+        print('\n\u001b[1musage:\u001b[0m sshyp add [flag [<entry name>]]\u001b[0m\n')
-        print('\u001b[38;5;0;48;5;15mFlags:\u001b[0m')
+        print('\u001b[1mflags:\u001b[0m')
-        print('\u001b[38;5;15;48;5;238madd:\u001b[0m')
+        print('add:')
         print(' password/-p             add a password entry')
         print(' note/-n                 add a note entry')
         print(' folder/-f               add a new folder for entries\n')
-    elif argument == 'edit':
+    elif argument_list[0] == 'edit':
-        print('\n\u001b[38;5;15;48;5;238mUSAGE: sshyp edit {FLAG {<entry name>}}\u001b[0m\n')
+        print('\n\u001b[1musage:\u001b[0m sshyp edit [flag [<entry name>]]\u001b[0m\n')
-        print('\u001b[38;5;0;48;5;15mFlags:\u001b[0m')
+        print('\u001b[1mflags:\u001b[0m')
-        print('\u001b[38;5;15;48;5;238medit:\u001b[0m')
+        print('edit:')
         print(' rename/relocate/-r      rename or relocate an entry')
         print(' username/-u             change the username of an entry')
         print(' password/-p             change the password of an entry')
         print(' url/-l                  change the url attached to an entry')
         print(' note/-n                 change the note attached to an entry\n')
-    elif argument == 'copy':
+    elif argument_list[0] == 'copy':
-        print('\n\u001b[38;5;15;48;5;238mUSAGE: sshyp copy {FLAG {<entry name>}}\u001b[0m\n')
+        print('\n\u001b[1musage:\u001b[0m sshyp copy [flag [<entry name>]]\u001b[0m\n')
-        print('\u001b[38;5;0;48;5;15mFlags:\u001b[0m')
+        print('\u001b[1mflags:\u001b[0m')
-        print('\u001b[38;5;15;48;5;238mcopy:\u001b[0m')
+        print('copy:')
         print(' username/-u             copy the username of an entry to your clipboard')
         print(' password/-p             copy the password of an entry to your clipboard')
-        print(' url/-l                  copy the URL of an entry to your clipboard')
+        print(' url/-l                  copy the url of an entry to your clipboard')
         print(' note/-n                 copy the note of an entry to your clipboard\n')
 
 
 def no_arg():  # displays a list of entries and gives an option to select one for viewing
-    print("\nFor a list of usable commands, run 'sshyp help'.")
+    print("\nfor a list of usable commands, run 'sshyp help'")
-    entry_list_gen()
+    _entry_name = entry_name_fetch('entry to read: ')
-    _read_entry = str(input('Entry to read: '))
+    if not Path(f"{directory}{_entry_name}.gpg").exists():
-    if not Path(f"{directory}{_read_entry}.gpg").exists():
+        print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n")
-        print(f"\n\u001b[38;5;1mError: entry ({_read_entry}) does not exist\u001b[0m\n")
         s_exit(1)
     _shm_folder, _shm_entry = shm_gen()
-    system(f"{gpg} -qd --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{_read_entry}.gpg'")
+    decrypt(directory + _entry_name, _shm_folder, _shm_entry)
     entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
     rmtree(f"{tmp_dir}{_shm_folder}")
 
 
 def read_shortcut():  # shortcut to quickly read an entry
     if not Path(f"{directory}{argument.replace('/', '', 1)}.gpg").exists():
-        print(f"\n\u001b[38;5;1mError: entry ({argument.replace('/', '', 1)}) does not exist\u001b[0m\n")
+        print(f"\n\u001b[38;5;9merror: entry ({argument.replace('/', '', 1)}) does not exist\u001b[0m\n")
         s_exit(1)
     _shm_folder, _shm_entry = shm_gen()
-    system(f"{gpg} -qd --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{argument.replace('/', '', 1)}.gpg'")
+    decrypt(directory + argument.replace('/', '', 1), _shm_folder, _shm_entry)
     entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
     rmtree(f"{tmp_dir}{_shm_folder}")
 
 
 def sync():  # calls sshync to sync changes to the user's server
-    print('\nSyncing entries with the server device...\n')
+    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 /bin; python -c "
            f"'import sshypRemote; sshypRemote.deletion_check(\"'\"{client_device_name}\"'\")'\"")
@@ -332,7 +379,7 @@ def sync():  # calls sshync to sync changes to the user's server
     try:
         _deletion_database = open(path.expanduser('~/.config/sshyp/deletion_database')).readlines()
     except (FileNotFoundError, IndexError):
-        print('\n\u001b[38;5;1mError: the deletion database does not exist or is corrupted.\u001b[0m\n')
+        print('\n\u001b[38;5;9merror: the deletion database does not exist or is corrupted.\u001b[0m\n')
         _deletion_database = None
         s_exit(1)
     for _file in _deletion_database:
@@ -343,7 +390,7 @@ def sync():  # calls sshync to sync changes to the user's server
                 rmtree(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}")
             except FileNotFoundError:
                 if silent_sync != 1:
-                    print('Folder does not exist locally.')
+                    print('folder does not exist locally.')
         else:
             try:
                 if silent_sync != 1:
@@ -351,7 +398,7 @@ def sync():  # calls sshync to sync changes to the user's server
                 remove(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}.gpg")
             except (FileNotFoundError, IsADirectoryError):
                 if silent_sync != 1:
-                    print('File does not exist locally.')
+                    print('file does not exist locally.')
     # check for new folders
     system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c "
            f"'import sshypRemote; sshypRemote.folder_check()'\"")
@@ -360,7 +407,7 @@ def sync():  # calls sshync to sync changes to the user's server
     try:
         _folder_database = open(path.expanduser('~/.config/sshyp/folder_database')).readlines()
     except (FileNotFoundError, IndexError):
-        print('\n\u001b[38;5;1mError: the folder database does not exist or is corrupted.\u001b[0m\n')
+        print('\n\u001b[38;5;9merror: the folder database does not exist or is corrupted.\u001b[0m\n')
         _folder_database = None
         s_exit(1)
     for _folder in _folder_database:
@@ -378,24 +425,20 @@ def sync():  # calls sshync to sync changes to the user's server
 
 def add_entry():  # adds a new entry
     _shm_folder, _shm_entry = None, None  # sets base-line values to avoid errors
-    if argument == 'add note' or argument == 'add -n' or argument == 'add password' or argument == 'add -p':
+    if len(argument_list) < 3:
-        _entry_name = str(input('\nName of entry: '))
+        _entry_name = entry_name_fetch('name of new entry: ')
     else:
-        _entry_name = argument.split(' ')
+        _entry_name = entry_name_fetch(2)
-        del _entry_name[:2]
+    if argument_list[1] == 'note' or argument_list[1] == '-n':
-        _entry_name = ' '.join(_entry_name)
-    if _entry_name.startswith('/'):
-        _entry_name = _entry_name.replace('/', '', 1)
-    if argument.startswith('add note') or argument.startswith('add -n'):
         _shm_folder, _shm_entry = shm_gen()
         system(f"nano {tmp_dir}{_shm_folder}/{_shm_entry}-n")
         _notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'r').read()
         open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines('\n\n\n' + _notes)
-    elif argument.startswith('add password') or argument.startswith('add -p'):
+    elif argument_list[1] == 'password' or argument_list[1] == '-p':
-        _username = str(input('Username: '))
+        _username = str(input('username: '))
-        _password = str(input('Password: '))
+        _password = str(input('password: '))
-        _url = str(input('URL: '))
+        _url = str(input('url: '))
-        _add_note = input('Add a note to this entry? (y/N) ')
+        _add_note = input('add a note to this entry? (y/N) ')
         _shm_folder, _shm_entry = shm_gen()
         if _add_note.lower() == 'y':
             system(f"nano {tmp_dir}{_shm_folder}/{_shm_entry}-n")
@@ -404,39 +447,30 @@ def add_entry():  # adds a new entry
             _notes = ''
         open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_password + '\n' + _username + '\n' + _url +
                                                                      '\n' + _notes)
-        print('\nEntry preview:')
+        print('\n\u001b[1mentry preview:\u001b[0m')
         entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
     encrypt(_shm_folder, _shm_entry, _entry_name)
 
 
 def add_folder():  # creates a new folder
-    if argument == 'add folder' or argument == 'add -f':
+    if len(argument_list) < 3:
-        _folder_name = str(input('Name of new folder: '))
+        _entry_name = entry_name_fetch('name of new folder: ')
     else:
-        _folder_name = argument.split(' ')
+        _entry_name = entry_name_fetch(2)
-        del _folder_name[:2]
+    Path(directory + _entry_name).mkdir(0o700)
-        _folder_name = ' '.join(_folder_name)
-    if _folder_name.startswith('/'):
-        _folder_name = _folder_name.replace('/', '', 1)
-    Path(directory + _folder_name).mkdir(0o700)
     system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"mkdir -p '{directory_ssh}"
-           f"{_folder_name}'\"")
+           f"{_entry_name}'\"")
 
 
 def rename():  # renames an entry or folder
     if argument == 'edit rename' or argument == 'edit relocate' or argument == 'edit -r':
-        entry_list_gen()
+        _entry_name = entry_name_fetch('entry/folder to rename/relocate: ')
-        _entry_name = str(input('What would you like to rename/relocate? '))
     else:
-        _entry_name = argument.split(' ')
+        _entry_name = entry_name_fetch(2)
-        del _entry_name[:2]
-        _entry_name = ' '.join(_entry_name)
     if not Path(f"{directory}{_entry_name}.gpg").exists():
-        print(f"\n\u001b[38;5;1mError: entry ({_entry_name}) does not exist\u001b[0m\n")
+        print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n")
         s_exit(1)
-    _new_name = str(input('New Name: '))
+    _new_name = str(input('new name: '))
-    if _entry_name.startswith('/'):
-        _entry_name = _entry_name.replace('/', '', 1)
     if _entry_name.endswith('/'):
         move(f"{directory}{_entry_name}", f"{directory}{_new_name}")
         system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"mkdir -p '{directory_ssh}"
@@ -449,21 +483,15 @@ def rename():  # renames an entry or folder
 
 def edit():  # edits the contents of an entry
     _shm_folder, _shm_entry = None, None  # sets base-line values to avoid errors
-    if argument == 'edit username' or argument == 'edit -u' or argument == 'edit password' or argument == 'edit -p' or \
+    if len(argument_list) < 3:
-            argument == 'edit url' or argument == 'edit -l' or argument == 'edit note' or argument == 'edit -n':
+        _entry_name = entry_name_fetch('entry to edit: ')
-        entry_list_gen()
-        _entry_name = str(input('What file would you like to edit? '))
     else:
-        _entry_name = argument.split(' ')
+        _entry_name = entry_name_fetch(2)
-        del _entry_name[:2]
-        _entry_name = ' '.join(_entry_name)
-    if _entry_name.startswith('/'):
-        _entry_name = _entry_name.replace('/', '', 1)
     if not Path(f"{directory}{_entry_name}.gpg").is_file():
-        print(f"\n\u001b[38;5;1mError: entry ({_entry_name}) does not exist\u001b[0m\n")
+        print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n")
         s_exit(1)
     _shm_folder, _shm_entry = shm_gen()
-    system(f"{gpg} -qd --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
+    decrypt(directory + _entry_name, _shm_folder, _shm_entry)
 
     # compatibility check for GNU pass entries (ensuring they have at least four lines)
     _lines = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines()
@@ -472,19 +500,19 @@ def edit():  # edits the contents of an entry
             _lines.append('\n')
         open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_lines)
 
-    if argument.startswith('edit username') or argument.startswith('edit -u'):
+    if argument_list[1] == 'username' or argument_list[1] == '-u':
-        _detail = str(input('New Username: '))
+        _detail = str(input('new username: '))
         replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 1, _detail + '\n')
-    elif argument.startswith('edit password') or argument.startswith('edit -p'):
+    elif argument_list[1] == 'password' or argument_list[1] == '-p':
-        _detail = str(input('New Password: '))
+        _detail = str(input('new password: '))
         replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 0, _detail + '\n')
-    elif argument.startswith('edit url') or argument.startswith('edit -l'):
+    elif argument_list[1] == 'url' or argument_list[1] == '-l':
-        _detail = str(input('New URL: '))
+        _detail = str(input('new url: '))
         replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 2, _detail + '\n')
-    elif argument.startswith('edit note') or argument.startswith('edit -n'):
+    elif argument_list[1] == 'note' or argument_list[1] == '-n':
         edit_note(_shm_folder, _shm_entry)
     remove(f"{directory}{_entry_name}.gpg")
-    print('\nEntry preview:')
+    print('\n\u001b[1mentry preview:\u001b[0m')
     entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
     encrypt(_shm_folder, _shm_entry, _entry_name)
 
@@ -492,31 +520,19 @@ def edit():  # edits the contents of an entry
 def gen():  # generates a password for a new or an existing entry
     _username, _url, _notes = None, None, None  # sets base-line values to avoid errors
     if argument == 'gen update' or argument == 'gen -u' or argument == 'gen':
-        if argument == 'gen update' or argument == 'gen -u':
+        _entry_name = entry_name_fetch('name of entry: ')
-            entry_list_gen()
+    elif argument_list[1] == 'update' or argument_list[1] == '-u':
-        else:
+        _entry_name = entry_name_fetch(2)
-            print()
-        _entry_name = str(input('Name of service: '))
-    elif argument.startswith('gen update') or argument.startswith('gen -u'):
-        _entry_name = argument.split(' ')
-        del _entry_name[:2]
-        _entry_name = ' '.join(_entry_name)
-    else:
-        _entry_name = argument.split(' ')
-        del _entry_name[:1]
-        _entry_name = ' '.join(_entry_name)
-    if _entry_name.startswith('/'):
-        _entry_name = _entry_name.replace('/', '', 1)
-    if argument.startswith('gen update') or argument.startswith('gen -u'):
         if not Path(f"{directory}{_entry_name}.gpg").is_file():
-            print(f"\n\u001b[38;5;1mError: entry ({_entry_name}) does not exist\u001b[0m\n")
+            print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n")
             s_exit(1)
     else:
-        _username = str(input('Username: '))
+        _entry_name = entry_name_fetch(1)
+        _username = str(input('username: '))
     _password = pass_gen()
-    if not argument.startswith('gen update') and not argument.startswith('gen -u'):
+    if not argument_list[1] == 'update' and not argument_list[1] == '-u':
-        _url = str(input('URL: '))
+        _url = str(input('url: '))
-        _add_note = input('Add a note to this entry? (y/N) ')
+        _add_note = input('add a note to this entry? (y/N) ')
         _shm_folder, _shm_entry = shm_gen()
         if _add_note.lower() == 'y':
             system(f"nano {tmp_dir}{_shm_folder}/{_shm_entry}-n")
@@ -525,72 +541,68 @@ def gen():  # generates a password for a new or an existing entry
             _notes = ''
         open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_password + '\n' + _username + '\n' + _url + '\n'
                                                                      + _notes)
-        print('\nEntry preview:')
+        print('\n\u001b[1mentry preview:\u001b[0m')
         entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
         encrypt(_shm_folder, _shm_entry, _entry_name)
     else:
         _shm_folder, _shm_entry = shm_gen()
-        system(f"{gpg} -qd --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
+        decrypt(directory + _entry_name, _shm_folder, _shm_entry)
         replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 0, _password + '\n')
         remove(f"{directory}{_entry_name}.gpg")
-        print('\nEntry preview:')
+        print('\n\u001b[1mentry preview:\u001b[0m')
         entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
         encrypt(_shm_folder, _shm_entry, _entry_name)
 
 
 def copy_data():  # copies a specified field of an entry to the clipboard
-    if argument == 'copy username' or argument == 'copy -u' or argument == 'copy password' or argument == 'copy -p' \
+    if len(argument_list) < 3:
-            or argument == 'copy url' or argument == 'copy -l' or argument == 'copy note' or argument == 'copy -n':
+        _entry_name = entry_name_fetch('entry to copy: ')
-        entry_list_gen()
-        _read_entry = str(input('Entry to copy: '))
     else:
-        _read_entry = argument.split(' ')
+        _entry_name = entry_name_fetch(2)
-        del _read_entry[:2]
+    if not Path(f"{directory}{_entry_name}.gpg").is_file():
-        _read_entry = ' '.join(_read_entry)
+        print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n")
-    if not Path(f"{directory}{_read_entry}.gpg").is_file():
-        print(f"\n\u001b[38;5;1mError: entry ({_read_entry}) does not exist\u001b[0m\n")
         s_exit(1)
     _shm_folder, _shm_entry = shm_gen()
-    system(f"{gpg} -qd --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{_read_entry}.gpg'")
+    decrypt(directory + _entry_name, _shm_folder, _shm_entry)
     _copy_line = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines()
     if uname()[0] == 'Haiku':  # Haiku clipboard detection
-        if argument.startswith('copy username') or argument.startswith('copy -u'):
+        if argument_list[1] == 'username' or argument_list[1] == '-u':
             system('clipboard -c ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy password') or argument.startswith('copy -p'):
+        elif argument_list[1] == 'password' or argument_list[1] == '-p':
             system('clipboard -c ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy url') or argument.startswith('copy -l'):
+        elif argument_list[1] == 'url' or argument_list[1] == '-l':
             system('clipboard -c ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy note') or argument.startswith('copy -n'):
+        elif argument_list[1] == 'note' or argument_list[1] == '-n':
             system('clipboard -c ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'")
         Popen('sleep 30; clipboard -r', shell=True)
     elif Path("/data/data/com.termux").exists():  # Termux (Android) clipboard detection
-        if argument.startswith('copy username') or argument.startswith('copy -u'):
+        if argument_list[1] == 'username' or argument_list[1] == '-u':
             system('termux-clipboard-set ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy password') or argument.startswith('copy -p'):
+        elif argument_list[1] == 'password' or argument_list[1] == '-p':
             system('termux-clipboard-set ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy url') or argument.startswith('copy -l'):
+        elif argument_list[1] == 'url' or argument_list[1] == '-l':
             system('termux-clipboard-set ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy note') or argument.startswith('copy -n'):
+        elif argument_list[1] == 'note' or argument_list[1] == '-n':
             system('termux-clipboard-set ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'")
         Popen("sleep 30; termux-clipboard-set ''", shell=True)
     elif environ.get('WAYLAND_DISPLAY') == 'wayland-0':  # Wayland clipboard detection
-        if argument.startswith('copy username') or argument.startswith('copy -u'):
+        if argument_list[1] == 'username' or argument_list[1] == '-u':
             system('wl-copy ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy password') or argument.startswith('copy -p'):
+        elif argument_list[1] == 'password' or argument_list[1] == '-p':
             system('wl-copy ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy url') or argument.startswith('copy -l'):
+        elif argument_list[1] == 'url' or argument_list[1] == '-l':
             system('wl-copy ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument.startswith('copy note') or argument.startswith('copy -n'):
+        elif argument_list[1] == 'note' or argument_list[1] == '-n':
             system('wl-copy ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'")
         Popen('sleep 30; wl-copy -c', shell=True)
     else:  # X11 clipboard detection
-        if argument.startswith('copy username') or argument.startswith('copy -u'):
+        if argument_list[1] == 'username' or argument_list[1] == '-u':
             system('echo -n ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        elif argument.startswith('copy password') or argument.startswith('copy -p'):
+        elif argument_list[1] == 'password' or argument_list[1] == '-p':
             system('echo -n ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        elif argument.startswith('copy url') or argument.startswith('copy -l'):
+        elif argument_list[1] == 'url' or argument_list[1] == '-l':
             system('echo -n ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        elif argument.startswith('copy note') or argument.startswith('copy -n'):
+        elif argument_list[1] == 'note' or argument_list[1] == '-n':
             system('echo -n ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
         Popen("sleep 30; echo -n '' | xclip -sel c", shell=True)
     rmtree(f"{tmp_dir}{_shm_folder}")
@@ -598,28 +610,17 @@ def copy_data():  # copies a specified field of an entry to the clipboard
 
 def remove_data():  # deletes an entry from the server and flags it for local deletion on sync
     if argument == 'shear' or argument == '-rm':
-        entry_list_gen()
+        _entry_name = entry_name_fetch('entry/folder to shear: ')
-        _entry_name = str(input('What would you like to delete? '))
     else:
-        _entry_name = argument.split(' ')
+        _entry_name = entry_name_fetch(1)
-        del _entry_name[:1]
+    decrypt(path.expanduser('~/.config/sshyp/lock.gpg'), 0, 0)
-        _entry_name = ' '.join(_entry_name)
-    if _entry_name.startswith('/'):
-        _entry_name = _entry_name.replace('/', '', 1)
-    try:
-        system(f"{gpg} -qd --output {tmp_dir}sshyp.lock {path.expanduser('~/.config/sshyp/lock.gpg')}")
-        _unlock = open(f"{tmp_dir}sshyp.lock", 'r').readlines()
-        remove(f"{tmp_dir}sshyp.lock")
-    except FileNotFoundError:
-        print('\nAccess denied.\n')
-        s_exit(1)
     system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c "
            f"'import sshypRemote; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"")
 
 
 if __name__ == "__main__":
     try:
-        silent_sync = 0
+        silent_sync, ssh_error = 0, 0
         # retrieve typed argument
         argument_list, argument = argv, ''
         del argument_list[0]
@@ -638,7 +639,6 @@ if __name__ == "__main__":
             try:
                 device_type = open(path.expanduser('~/.config/sshyp/sshyp-device')).read().strip()
                 if device_type == 'c':
-                    gpg_id = open(path.expanduser('~/.config/sshyp/sshyp-gpg')).read().strip()
                     ssh_info = sshync.get_profile(path.expanduser('~/.config/sshyp/sshyp.sshync'))
                     username_ssh = ssh_info[0].replace('\n', '')
                     ip = ssh_info[1].replace('\n', '')
@@ -646,64 +646,75 @@ if __name__ == "__main__":
                     directory = str(ssh_info[3].replace('\n', ''))
                     directory_ssh = '/home/' + username_ssh + '/.password-pasture/'
                     client_device_name = listdir(path.expanduser('~/.config/sshyp/devices'))[0]
-            except FileNotFoundError:
+                    gpg_id = open(path.expanduser('~/.config/sshyp/sshyp-gpg')).read().strip()
+                    ssh_error = int(open(path.expanduser('~/.config/sshyp/ssh-error')).read().strip())
+                    if ssh_error != 0:
+                        ssh_error = copy_name_check(port, username_ssh, ip, client_device_name)
+            except (FileNotFoundError, IndexError):
                 if device_type.lower() != 's':
                     print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-                    print("Not all necessary configuration files are present. Please run 'sshyp tweak'!")
+                    print("not all necessary configuration files are present - please run 'sshyp tweak'")
                     print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n')
                 s_exit(1)
         else:
             tweak()
             s_exit(0)
 
-        # run function based on argument
+        # run function based on arguments
-        error = 0  # create an error flag to determine if syncing should occur at end
         if argument.startswith('/'):
             read_shortcut()
         elif argument == '':
             no_arg()
         elif argument == 'help' or argument == '--help' or argument == '-h' or argument == 'license' or argument \
-                == 'version' or argument == '-v' or argument == 'add' or argument == 'edit' or argument == 'copy':
+                == 'version' or argument == '-v':
             print_info()
-        elif argument.startswith('add note') or argument.startswith('add -n') or argument.startswith('add password') \
+        elif argument_list[0] == 'add':
-                or argument.startswith('add -p'):
+            if len(argument_list) == 1:
-            add_entry()
+                print_info()
-        elif argument.startswith('add folder') or argument.startswith('add -f'):
+            elif argument_list[1] == 'note' or argument_list[1] == '-n' or argument_list[1] == 'password' or \
-            add_folder()
+                    argument_list[1] == '-p':
-        elif argument.startswith('edit rename') or argument.startswith('edit relocate') or argument.startswith(
+                add_entry()
-                'edit -r'):
+            elif argument_list[1] == 'folder' or argument_list[1] == '-f':
-            silent_sync = 1
+                add_folder()
-            rename()
+            else:
-        elif argument.startswith('edit username') or argument.startswith('edit -u') or argument.startswith(
+                print_info()
-                'edit password') \
+                s_exit(0)
-                or argument.startswith('edit -p') or argument.startswith('edit url') or argument.startswith(
+        elif argument_list[0] == 'edit':
-            'edit -l') or \
+            if len(argument_list) == 1:
-                argument.startswith('edit note') or argument.startswith('edit -n'):
+                print_info()
-            edit()
+            elif argument_list[1] == 'rename' or argument_list[1] == 'relocate' or argument_list[1] == '-r':
-        elif argument.startswith('gen'):
+                silent_sync = 1
+                rename()
+            elif argument_list[1] == 'username' or argument_list[1] == '-u' or argument_list[1] == 'password' or \
+                    argument_list[1] == '-p' or argument_list[1] == 'url' or argument_list[1] == '-l' or \
+                    argument_list[1] == 'note' or argument_list[1] == '-n':
+                edit()
+            else:
+                print_info()
+                s_exit(0)
+        elif argument_list[0] == 'gen':
             gen()
-        elif argument.startswith('copy username') or argument.startswith('copy -u') or argument.startswith(
+        elif argument_list[0] == 'copy':
-                'copy password') \
+            if len(argument_list) == 1:
-                or argument.startswith('copy -p') or argument.startswith('copy url') or argument.startswith('copy -l') \
+                print_info()
-                or argument.startswith('copy note') or argument.startswith('copy -n'):
+            elif argument_list[1] == 'username' or argument_list[1] == '-u' or argument_list[1] == 'password' or \
-            copy_data()
+                    argument_list[1] == '-p' or argument_list[1] == 'url' or argument_list[1] == '-l' or \
-        elif argument.startswith('shear') or argument.startswith('-rm'):
+                    argument_list[1] == 'note' or argument_list[1] == '-n':
+                copy_data()
+            else:
+                print_info()
+        elif argument_list[0] == 'shear' or argument_list[0] == '-rm':
             remove_data()
-        elif argument == 'sync' or argument == '-s':
+        elif argument_list[0] != 'sync' and argument_list[0] != '-s':
-            sync()
+            print(f"\n\u001b[38;5;9merror: invalid argument - run 'sshyp help' to list usable commands\u001b[0m\n")
-        else:
-            error = 1  # set error flag to 1 to stop syncing
-            print("\nArgument error! Please run 'sshyp help' for a list of usable commands.\n")
             s_exit(1)
 
-        # sync at end of program if any changes were made
+        # sync if any changes were made
-        if argument != '' and argument != 'help' and argument != '--help' and argument != '-h' and argument != \
+        if len(argument_list) > 0 and ssh_error == 0 and \
-                'license' and argument != 'add' and argument != 'sync' and argument != 'edit' and not argument\
+                ((argument_list[0] == 'sync' or argument_list[0] == '-s' or argument_list[0] == 'gen' or
-                .startswith('copy username') and not argument.startswith('copy -u') and not argument\
+                  argument_list[0] == 'shear' or argument_list[0] == '-rm') or ((argument_list[0] == 'add'
-                .startswith('copy password') and not argument.startswith('copy -p') and not argument\
+                                                                                 or argument_list[0] == 'edit')
-                .startswith('copy url') and not argument.startswith('copy -l') and not argument.startswith('copy note')\
+                                                                                and len(argument_list) > 1)):
-                and not argument.startswith('copy -n') and argument != 'copy' and argument != 'version' and argument \
-                != '-v' and error == 0 and argument.startswith('/') is False:
             sync()
 
         s_exit(0)

bin/sshypRemote.py

@@ -14,12 +14,12 @@ def delete(_file_path):
         try:
             rmtree(f"{expanduser('~/.password-pasture/')}{_file_path}")
         except FileNotFoundError:
-            print('Folder does not exist remotely.')
+            print('folder does not exist remotely')
     else:
         try:
             remove(f"{expanduser('~/.password-pasture/')}{_file_path}.gpg")
         except FileNotFoundError:
-            print('File does not exist remotely.')
+            print('file does not exist remotely')
     for _device_name in listdir(expanduser('~/.config/sshyp/devices')):
         open(f"{expanduser('~/.config/sshyp/deleted/')}{_file_path.replace('/', '@')}^&*{_device_name}", 'w')
 

extra/changelog-total

@@ -1,3 +1,40 @@
+sshyp v1.0.0
+
+The Polished Trotters Update
+
+This release brings 'sshyp' in line with the original goals of the project.
+As such, it is being crowned "v1.0.0", and is considered a stable base for future expansions.
+
+Features:
+
+- sshyp has been modified to run on Haiku, an open-source re-implementation of BeOS
+    ^ new package formats have been added for Haiku, FreeBSD, and Red Hat distributions (such as Fedora)
+- the entry format has been changed to support entries created in pass/password-store
+    ^ this change requires existing entry libraries to be converted - see the sshyp v1.0.0 release page on GitHub for a conversion script
+- majorly overhauled visual experience for sshyp
+    ^ this includes a new entry list, a new entry readout, colored output, ascii art, and more!
+- entries can now optionally be passed as arguments, directly
+    ^ as opposed to the user being prompted for an entry name after running a command
+
+Changes:
+
+- corrected outdated licensing and copyright information
+- 'if __name__=="__main__":' convention is now used
+- help screens have been overhauled
+- improved password generator to guarantee more secure results
+- fixed errors when trying to sync with a multi-word entry on the server
+- sshync now uses 'scp' (via the sftp protocol), rather than 'sftp'
+- rename function now properly allows for renaming folders
+- renaming an entry/folder will now properly delete the old entry/folder from the server
+- entry previews at the time of entry creation/editing no longer require entering the gpg password more times than necessary
+- the clipboard now automatically clears after 30 seconds
+- sshyp server no longer needs to create copies of its libraries in ~/
+- added more and improved existing exceptions
+- the lock file is now decrypted to /dev/null
+- ...and lots of minor (under the hood) changes!
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
 sshyp 2022.02.16.fr4.7
 
 The High-Tech Shears Update - Patch 7
@@ -17,28 +54,28 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -59,29 +96,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -102,29 +139,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -149,29 +186,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -192,29 +229,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -236,29 +273,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -280,29 +317,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -331,29 +368,29 @@ Changes:
 Planned for next major update (fr5, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr6, The Farmer Shearing the sshyp Update):
 
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -374,30 +411,30 @@ Changes:
 Planned for next major update (fr4, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr5, The Farmer Shearing the sshyp Update):
 
-** allow for multi-client deletion... somehow (in sshync)
+- allow for multi-client deletion... somehow (in sshync)
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -418,39 +455,39 @@ Changes:
 
 Additions planned for minor releases:
 
-** updated the manpage with more information regarding how sshyp works and how to set it up
+- updated the manpage with more information regarding how sshyp works and how to set it up
-** ensured that it is now impossible for ghosts of entires to remain in /dev/shm
+- ensured that it is now impossible for ghosts of entires to remain in /dev/shm
-** reduced total lines of code with small optimizations
+- reduced total lines of code with small optimizations
 
 &&
 
 Planned for next major update (fr4, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr5, The Farmer Shearing the sshyp Update):
 
-** allow for multi-client deletion... somehow (in sshync)
+- allow for multi-client deletion... somehow (in sshync)
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -468,39 +505,39 @@ Changes:
 
 Additions planned for minor releases:
 
-** updated the manpage with more information regarding how sshyp works and how to set it up
+- updated the manpage with more information regarding how sshyp works and how to set it up
-** ensured that it is now impossible for ghosts of entires to remain in /dev/shm
+- ensured that it is now impossible for ghosts of entires to remain in /dev/shm
-** reduced total lines of code with small optimizations
+- reduced total lines of code with small optimizations
 
 &&
 
 Planned for next major update (fr4, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr5, The Farmer Shearing the sshyp Update):
 
-** allow for multi-client deletion... somehow (in sshync)
+- allow for multi-client deletion... somehow (in sshync)
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -519,39 +556,39 @@ Changes:
 
 Additions planned for minor releases:
 
-** updated the manpage with more information regarding how sshyp works and how to set it up
+- updated the manpage with more information regarding how sshyp works and how to set it up
-** ensured that it is now impossible for ghosts of entires to remain in /dev/shm
+- ensured that it is now impossible for ghosts of entires to remain in /dev/shm
-** reduced total lines of code with small optimizations
+- reduced total lines of code with small optimizations
 
 &&
 
 Planned for next major update (fr4, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr5, The Farmer Shearing the sshyp Update):
 
-** allow for multi-client deletion... somehow (in sshync)
+- allow for multi-client deletion... somehow (in sshync)
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -574,39 +611,39 @@ Changes:
 
 Additions planned for minor releases:
 
-** updated the manpage with more information regarding how sshyp works and how to set it up
+- updated the manpage with more information regarding how sshyp works and how to set it up
-** ensured that it is now impossible for ghosts of entires to remain in /dev/shm
+- ensured that it is now impossible for ghosts of entires to remain in /dev/shm
-** reduced total lines of code with small optimizations
+- reduced total lines of code with small optimizations
 
 &&
 
 Planned for next major update (fr4, The sshyp Doing a Split Update):
 
 sshyp:
-** sshyp has recieved a major visual overhaul
+- sshyp has recieved a major visual overhaul
     ^ this includes the new file list and thematic text art
 
 sshync:
-** sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
+- sshync has been split into a separate package and now has standalone functionality as a backup/syncing utility
     ^ more details will be available in the sshync repo, once it is created
 
 &&
 
 Planned for next, next major update (fr5, The Farmer Shearing the sshyp Update):
 
-** allow for multi-client deletion... somehow (in sshync)
+- allow for multi-client deletion... somehow (in sshync)
-** when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
-** imporove password generator to guarantee more secure results
+- imporove password generator to guarantee more secure results
-** enforce permissions on the server-side
+- enforce permissions on the server-side
-** allow for copying entire notes (not just first line)
+- allow for copying entire notes (not just first line)
-** ability to pass entries as arguments for more functions
+- ability to pass entries as arguments for more functions
 
 &&
 
 Backlog:
 
-** create separate gui frontend targetting mobile and desktop Linux
+- create separate gui frontend targetting mobile and desktop Linux
-** auto-completion on tab (currently unsure of best way to make this work)
+- auto-completion on tab (currently unsure of best way to make this work)
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
@@ -1121,5 +1158,3 @@ What is currently functional:
 - sort notes and passwords into folders
 - gpg encryption
 - edit password/note entries
-
-<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>

extra/manpage

@@ -1,6 +1,6 @@
-.TH sshyp 1 "22 May 2022" "v1.0.0" "sshyp man page"
+.TH sshyp 1 "17 June 2022" "v1.0.0" "sshyp man page"
 .SH NAME
-sshyp \- A very simple self-hosted, synchronized password manager for UNIX systems. Alternative to (and compatible with) pass/password-store.
+sshyp \- A very simple self-hosted, synchronized password manager for UNIX(-like) systems. Alternative to (and compatible with) pass/password-store.
 .SH SYNOPSIS
 sshyp [OPTION] [[FLAG]] [/<entry name>]
 .SH DESCRIPTION

package.sh

@@ -1,14 +1,13 @@
 #!/bin/bash
 
 # This script packages sshyp (from source) for various UNIX environments.
-
+# Dependencies (Arch Linux): dpkg (packaging for Debian/Termux), rpmdevtools (packaging for Red Hat), freebsd-pkg (packaging for FreeBSD)
 # NOTE It is recommended to instead use the latest officially packaged and tagged release.
-# NOTE If using Arch, it is recommended to install from the AUR or from the PKGBUILD attatched to the latest official release.
 
 echo -e '\nOptions (please enter the number only):'
-echo -e '\nDistribution Packages:\n\n1. Haiku\n2. Debian\n3. Termux\n4. Generic (used for PKGBUILD/APKBUILD)'
+echo -e '\nPackage Formats:\n\n1. Haiku\n2. Debian\n3. Red Hat\n4. FreeBSD\n5. Termux\n6. Generic (used for PKGBUILD/APKBUILD)'
-echo -e '\nBuild Scripts:\n\n5. Alpine Linux (APKBUILD)\n6. Arch Linux (PKGBUILD, also builds local generic package)'
+echo -e '\nBuild Scripts:\n\n7. Arch Linux (PKGBUILD)'
-echo -e '\nOther:\n\n7. All (generates all distribution packages (excluding Haiku, as this must be done on Haiku) and build scripts)\n'
+echo -e '\nOther:\n\n8. All (generates all distribution packages (excluding Haiku, as this must be done on Haiku) and build scripts)\n'
 read -n 1 -r -p "Distribution: " distro
 
 echo -e '\n\nThe value entered in this field will only affect the version reported to the package manager. The latest source is used regardless.\n'
@@ -17,7 +16,7 @@ read -r -p "Version number: " version
 echo -e '\nThe value entered in this field will only affect the revision number for build scripts.\n'
 read -r -p "Revision number: " revision
 
-if [ "$distro" == "5" ] || [ "$distro" == "6" ] || [ "$distro" == "7" ]; then
+if [ "$distro" == "7" ] || [ "$distro" == "8" ]; then
     echo -e '\nOptions (please enter the number only):'
     echo -e '\n1. GitHub Release Tag\n2. Local\n'
     read -r -p "Source (for build scripts): " source
@@ -33,8 +32,7 @@ mkdir -p packages
 
 if [ "$distro" == "1" ]; then
     echo -e '\nPackaging for Haiku...\n'
-    mkdir -p packages/haikutemp/documentation/man/man1
+    mkdir -p packages/haikutemp/documentation/{man/man1,packages/sshyp}
-    mkdir -p packages/haikutemp/documentation/packages/sshyp
     echo "name			sshyp
 version			"$version"-"$revision"
 architecture		any
@@ -76,10 +74,9 @@ urls {
     echo -e "\nHaiku packaging complete.\n"
 fi
 
-if [ "$distro" == "2" ] || [ "$distro" == "7" ]; then
+if [ "$distro" == "2" ] || [ "$distro" == "8" ]; then
     echo -e '\nPackaging for Debian...\n'
-    mkdir -p packages/debiantemp/sshyp_"$version"-"$revision"_all/{DEBIAN,usr}
+    mkdir -p packages/debiantemp/sshyp_"$version"-"$revision"_all/{DEBIAN,usr/share/man/man1}
-    mkdir -p packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1
     echo "Package: sshyp
 Version: $version
 Section: utils
@@ -100,7 +97,7 @@ Installed-Size: 35
     echo -e "\nDebian packaging complete.\n"
 fi
 
-if [ "$distro" == "3" ] || [ "$distro" == "7" ]; then
+if [ "$distro" == "5" ] || [ "$distro" == "8" ]; then
     echo -e '\nPackaging for Termux...\n'
     mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/{data,DEBIAN}
     mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1
@@ -124,12 +121,11 @@ Installed-Size: 35
     echo -e "\nTermux packaging complete.\n"
 fi
 
-if [ "$distro" == "4" ] || [ "$distro" == "6" ] || [ "$distro" == "7" ]; then
+if [ "$distro" == "3" ] || [ "$distro" == "4" ] || [ "$distro" == "6" ] || [ "$distro" == "7" ] || [ "$distro" == "8" ]; then
     echo -e '\nPackaging as generic...\n'
-    mkdir -p packages/archtemp/usr
+    mkdir -p packages/archtemp/usr/share/man/man1
     cp -r bin packages/archtemp/usr/
     cp -r share packages/archtemp/usr/
-    mkdir -p packages/archtemp/usr/share/man/man1
     cp extra/manpage packages/archtemp/usr/share/man/man1/sshyp.1
     gzip packages/archtemp/usr/share/man/man1/sshyp.1
     tar -C packages/archtemp -cvf packages/sshyp-"$version".tar.xz usr/
@@ -139,7 +135,91 @@ if [ "$distro" == "4" ] || [ "$distro" == "6" ] || [ "$distro" == "7" ]; then
     echo -e "\nGeneric packaging complete.\n"
 fi
 
-if [ "$distro" == "6" ] || [ "$distro" == "7" ]; then
+if [ "$distro" == "3" ] || [ "$distro" == "8" ]; then
+    echo -e '\nPackaging for Red Hat...\n'
+    rm -rf ~/rpmbuild
+    rpmdev-setuptree
+    cp packages/sshyp-"$version".tar.xz ~/rpmbuild/SOURCES
+    echo "Name:           sshyp
+Version:        "$version"
+Release:        "$revision"
+Summary:        A light-weight, self-hosted, synchronized password manager
+BuildArch:      noarch
+
+License:        GPL3
+URL:            https://github.com/rwinkhart/sshyp
+Source0:        sshyp-"$version".tar.xz
+
+Requires:       python gnupg openssh nano wl-clipboard 
+
+%description
+sshyp is a password-store compatible CLI password manager available for UNIX(-like) systems - its primary goal is to make syncing passwords and notes across devices as easy as possible via CLI.
+
+%install
+tar xf %{_sourcedir}/sshyp-"$version".tar.xz -C %{_sourcedir}
+cp -r %{_sourcedir}/usr %{buildroot}
+
+%files
+/usr/bin/sshyp
+/usr/bin/sshync.py
+/usr/bin/sshypRemote.py
+%license /usr/share/licenses/sshyp/license
+%doc /usr/share/doc/sshyp/changelog
+%doc /usr/share/man/man1/sshyp.1.gz
+" > ~/rpmbuild/SPECS/sshyp.spec
+rpmbuild -bb ~/rpmbuild/SPECS/sshyp.spec
+mv ~/rpmbuild/RPMS/noarch/* packages/
+rm -rf ~/rpmbuild
+echo -e "\nRed Hat packaging complete.\n"
+fi
+
+if [ "$distro" == "4" ] || [ "$distro" == "8" ]; then
+    echo -e '\nPackaging for FreeBSD...\n'
+    mkdir -p packages/FreeBSDtemp/bin
+    tar xf packages/sshyp-"$version".tar.xz -C packages/FreeBSDtemp
+    ln -s /usr/local/bin/python3 packages/FreeBSDtemp/bin/python3
+    echo "name: sshyp
+version: \""$version"\"
+abi = \"FreeBSD:13:*\";
+arch = \"freebsd:13:*\";
+origin: security/sshyp
+comment: \"a password manager\"
+desc: \"a light-weight, self-hosted, synchronized password manager\"
+maintainer: <idgr at tutanota dot com>
+www: https://github.com/rwinkhart/sshyp
+prefix: /
+\"deps\" : {
+                   \"python\" : {
+                      \"origin\" : \"lang/python\"
+                   },
+                   \"gnupg\" : {
+                      \"origin\" : \"security/gnupg\"
+                   },
+                   \"nano\" : {
+                      \"origin\" : \"editors/nano\"
+                   },
+                   \"xclip\" : {
+                      \"origin\" : \"x11/xclip\"
+                   },
+                   \"wl-clipboard\" : {
+                      \"origin\" : \"x11/wl-clipboard\"
+                   },
+                },
+" > packages/FreeBSDtemp/+MANIFEST
+echo "/bin/python3
+/usr/bin/sshync.py
+/usr/bin/sshyp
+/usr/bin/sshypRemote.py
+/usr/share/doc/sshyp/changelog
+/usr/share/licenses/sshyp/license
+/usr/share/man/man1/sshyp.1.gz
+" > packages/FreeBSDtemp/plist
+pkg create -m packages/FreeBSDtemp/ -r packages/FreeBSDtemp/ -p packages/FreeBSDtemp/plist -o packages/
+rm -rf packages/FreeBSDtemp
+echo -e "\nFreeBSD packaging complete.\n"
+fi
+
+if [ "$distro" == "7" ] || [ "$distro" == "8" ]; then
     echo -e '\nGenerating PKGBUILD...'
     echo "# Maintainer: Randall Winkhart <idgr at tutanota dot com>
 
@@ -163,7 +243,3 @@ package() {
 " > packages/PKGBUILD
     echo -e "\nPKGBUILD generated.\n"
 fi
-
-if [ "$distro" == "4" ]; then
-    echo -e '\nThis packaging format is not yet supported, but will be in the near future!\n'
-fi

share/doc/sshyp/changelog

@@ -8,26 +8,29 @@ As such, it is being crowned "v1.0.0", and is considered a stable base for futur
 Features:
 
 - sshyp has been modified to run on Haiku, an open-source re-implementation of BeOS
+    ^ new package formats have been added for Haiku, FreeBSD, and Red Hat distributions (such as Fedora)
 - the entry format has been changed to support entries created in pass/password-store
     ^ this change requires existing entry libraries to be converted - see the sshyp v1.0.0 release page on GitHub for a conversion script
 - majorly overhauled visual experience for sshyp
-    ^ this includes a new entry list, a new entry readout, coloured output, and more!
+    ^ this includes a new entry list, a new entry readout, colored output, ascii art, and more!
 - entries can now optionally be passed as arguments, directly
     ^ as opposed to the user being prompted for an entry name after running a command
 
 Changes:
 
-- corrected outdated liscensing and copyright information
+- corrected outdated licensing and copyright information
 - 'if __name__=="__main__":' convention is now used
 - help screens have been overhauled
 - improved password generator to guarantee more secure results
 - fixed errors when trying to sync with a multi-word entry on the server
-- sshync now uses 'scp' (via the sftp protocal), rather than 'sftp'
+- sshync now uses 'scp' (via the sftp protocol), rather than 'sftp'
 - rename function now properly allows for renaming folders
 - renaming an entry/folder will now properly delete the old entry/folder from the server
 - entry previews at the time of entry creation/editing no longer require entering the gpg password more times than necessary
 - the clipboard now automatically clears after 30 seconds
 - sshyp server no longer needs to create copies of its libraries in ~/
+- added more and improved existing exceptions
+- the lock file is now decrypted to /dev/null
 - ...and lots of minor (under the hood) changes!
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
@@ -37,6 +40,5 @@ https://raw.githubusercontent.com/rwinkhart/sshyp/main/extra/changelog-total
 
 Legend:
 
-** = feature/change not yet finished/implemented
 -  = feature/change implemented and pushed upstream
 ^  = note regarding the above feature/change