Updated documentation for release v1.1.1

Former-commit-id: defed7054804d7bf36e93c302282039d335d6561 [formerly 558512ba52]
Former-commit-id: f6cf7d3e5633652439a46c51f9d5cfad007f2236

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '34 22 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

README.md

@@ -1,4 +1,6 @@
-![sshyp](https://github.com/rwinkhart/sshyp/blob/main/extra/sshyp-linux-banner.png)
+![sshyp](https://github.com/rwinkhart/sshyp-labs/blob/main/extra/artwork/sshyp-banner.png)
+
+[![CodeQL](https://github.com/rwinkhart/sshyp/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/rwinkhart/sshyp/actions/workflows/codeql-analysis.yml)
 
 sshyp is a very simple self-hosted, synchronized password manager for UNIX(-like) systems (currently Haiku/FreeBSD/Linux).
 
@@ -23,12 +25,12 @@ What sshyp can do:
 - securely manage a collection of encrypted passwords and notes via CLI
 - generate new, secure passwords to the user's choice in length and complexity
 - securely sync said passwords and notes seamlessly between devices
+- utilize [extensions](https://github.com/rwinkhart/sshyp-labs) to interact with your entries is additional ways (such as generating TOTP keys)
 - everything above with entries created by pass/password-store!
 - everything above on Haiku, FreeBSD, Linux, and Termux (an Android terminal emulator)!
 
 What sshyp will likely do:
 
-- (planned v1.1.0) 2FA/MFA management (beneficial for reducing phone usage)
 - (planned v1.2.0) everything it already does, but also in a GUI for Linux/Haiku
 
 What sshyp definitely won't do:
@@ -42,6 +44,8 @@ Pre-built packages exist for Haiku, FreeBSD, Arch Linux, Debian/Ubuntu Linux, Fe
 
 Requests for additional distribution/OS support can be filed as issues.
 
+Extensions are available in the [sshyp-labs](https://github.com/rwinkhart/sshyp-labs) repository.
+
 # Building
 Since sshyp is written entirely in Python, it doesn't need to be compiled. It does, however, need to be packaged for installation.
 
@@ -87,10 +91,10 @@ man sshyp
 # Roadmap
 Short-term Goals:
 
-- 2FA/MFA management
-- create minimal GUI apps (Linux x86_64, Linux aarch64, Haiku x86_64)
+- create minimal GUI app (Linux x86_64, Linux aarch64)
 - various optimizations/bug fixes
 
 Long-term Goals:
 
+- a fun surprise
 - seize the thrones, shear the humans

bin/sshync.py

@@ -10,7 +10,7 @@ from sys import exit as s_exit
 
 # utility functions
 
-def get_titles_mods(_directory, _destination, _user_data):
+def get_titles_mods(_directory, _destination, _user_data):  # fetches and returns lists of titles and their mod times
     _title_list, _mod_list = [], []
     Path(path.expanduser('~/.config/sshync')).mkdir(0o700, parents=True, exist_ok=True)  # create config directory
     # local fetching
@@ -37,7 +37,8 @@ def get_titles_mods(_directory, _destination, _user_data):
     return _title_list, _mod_list
 
 
-def sort_titles_mods(_list_1, _list_2):
+def sort_titles_mods(_list_1, _list_2):  # creates and returns two lists (of titles and mod times) generated by sorting
+    # information from two different, provided lists
     _title_list_2_sorted, _mod_list_2_sorted = [], []
     # title sorting
     for _title in _list_1[0]:
@@ -52,12 +53,12 @@ def sort_titles_mods(_list_1, _list_2):
     return _title_list_2_sorted, _mod_list_2_sorted
 
 
-def make_profile(_profile_dir, _local_dir, _remote_dir, _identity, _ip, _port, _user):
+def make_profile(_profile_dir, _local_dir, _remote_dir, _identity, _ip, _port, _user):  # creates a sshync job profile
     open(_profile_dir, 'w').write(_user + '\n' + _ip + '\n' + _port + '\n' + _local_dir + '\n' + _remote_dir + '\n' +
                                   _identity + '\n')
 
 
-def get_profile(_profile_dir):
+def get_profile(_profile_dir):  # returns a list of data read from a sshync job profile
     try:
         _profile_data = open(_profile_dir).readlines()
     except (FileNotFoundError, IndexError):
@@ -74,7 +75,7 @@ def get_profile(_profile_dir):
     return _user, _ip, _port, _local_dir, _remote_dir, _identity
 
 
-def run_profile(_profile_dir):
+def run_profile(_profile_dir):  # runs a sshync job profile
     _user_data = get_profile(_profile_dir)
     _remote_titles_mods_saver = get_titles_mods(_user_data[4], 'r', _user_data)  # saved to prevent re-walking directory
     _index_l = sort_titles_mods(_remote_titles_mods_saver, get_titles_mods(_user_data[3], 'l', _user_data))

bin/sshyp.py

@@ -4,22 +4,22 @@
 
 from os import environ, listdir, path, remove, system, uname, walk
 from pathlib import Path
-import random
+from random import randint, SystemRandom
 from shutil import get_terminal_size, move, rmtree
 import sshync
 import string
-from subprocess import Popen, PIPE, STDOUT
+from subprocess import CalledProcessError, Popen, PIPE, run
 from sys import argv, exit as s_exit
 from textwrap import fill
 
 
-# utility functions
+# BELOW - utility functions
 
-def entry_list_gen():  # generates and prints a list of all folders and entries
+def entry_list_gen(_directory=path.expanduser('~/.local/share/sshyp/')):  # generates and prints full entry list
     print('\n\u001b[38;5;0;48;5;15msshyp entries:\u001b[0m\n')
     _entry_list, _color_alternator = [], 1
-    for _entry in sorted(listdir(path.expanduser('~/.password-pasture'))):
-        if Path(path.expanduser(f"~/.password-pasture/{_entry}")).is_file():
+    for _entry in sorted(listdir(_directory)):
+        if Path(f"{_directory}{_entry}").is_file():
             if _color_alternator == 1:
                 _entry_list.append(f"{_entry.replace('.gpg', '')}")
                 _color_alternator = 2
@@ -35,12 +35,12 @@ def entry_list_gen():  # generates and prints a list of all folders and entries
         print(fill(' '.join(_entry_list), width=_width) + '\n')
     except ValueError:
         pass
-    for _root, _directories, _files in walk(path.expanduser('~/.password-pasture')):
+    for _root, _directories, _files in walk(_directory):
         for _dir in sorted(_directories):
-            _inner_dir = f"{_root.replace(path.expanduser('~/.password-pasture'), '')}/{_dir}"
+            _inner_dir = f"{_root.replace(_directory, '')}/{_dir}"
             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 _s_root, _s_directories, _s_files in walk(f"{_directory[:-1]}{_inner_dir}"):
                 for _entry in sorted(_s_files):
                     if _color_alternator == 1:
                         _entry_list.append(f"{_entry.replace('.gpg', '')}")
@@ -59,20 +59,20 @@ def entry_list_gen():  # generates and prints a list of all folders and entries
                 print('\u001b[38;5;9m-empty directory-\u001b[0m\n')
 
 
-def entry_reader(_decrypted_entry):
+def entry_reader(_decrypted_entry):  # displays the contents of an entry in a readable format
     _entry_lines, _notes_flag = open(_decrypted_entry, 'r').readlines(), 0
     print()
     for _num in range(len(_entry_lines)):
         try:
             if _num == 0 and _entry_lines[1] != '\n':
-                print(f"\u001b[38;5;15;48;5;238musername:\u001b[0m\n{_entry_lines[1]}")
+                print(f"\u001b[38;5;15;48;5;238musername:\u001b[0m\n{_entry_lines[1].strip()}\n")
             elif _num == 1 and _entry_lines[0] != '\n':
-                print(f"\u001b[38;5;15;48;5;238mpassword:\u001b[0m\n{_entry_lines[0]}")
+                print(f"\u001b[38;5;15;48;5;238mpassword:\u001b[0m\n{_entry_lines[0].strip()}\n")
             elif _num == 2 and _entry_lines[2] != '\n':
-                print(f"\u001b[38;5;15;48;5;238murl:\u001b[0m\n{_entry_lines[_num]}")
+                print(f"\u001b[38;5;15;48;5;238murl:\u001b[0m\n{_entry_lines[_num].strip()}\n")
             elif _num >= 3 and _entry_lines[_num] != '\n' and _notes_flag != 1:
                 _notes_flag = 1
-                print('\u001b[38;5;15;48;5;238mnotes:\u001b[0m\n' + _entry_lines[_num].replace('\n', ''))
+                print(f"\u001b[38;5;15;48;5;238mnotes:\u001b[0m\n{_entry_lines[_num].strip()}")
             elif _num >= 3 and _notes_flag == 1:
                 print(_entry_lines[_num].replace('\n', ''))
             if _notes_flag == 1:
@@ -82,21 +82,13 @@ def entry_reader(_decrypted_entry):
                     print()
         except IndexError:
             if _num == 0:
-                print(f"\u001b[38;5;15;48;5;238mpassword:\u001b[0m\n{_entry_lines[0]}")
+                print(f"\u001b[38;5;15;48;5;238mpassword:\u001b[0m\n{_entry_lines[0]}\n")
 
 
-def replace_line(file_name, line_num, text):  # replaces text in a given line with different text
-    _lines = open(file_name, 'r').readlines()
-    _lines[line_num] = text
-    open(file_name, 'w').writelines(_lines)
-
-
-def entry_name_fetch(_entry_name_location):
+def entry_name_fetch(_entry_name_location):  # fetches and returns entry name from user input or from provided argument
     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]
@@ -107,22 +99,22 @@ def entry_name_fetch(_entry_name_location):
         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)))
-    _shm_entry_gen = ''.join(random.SystemRandom().choice(string.ascii_letters + string.digits)
-                             for _ in range(random.randint(10, 30)))
-    Path(tmp_dir + _shm_folder_gen).mkdir(0o700)
+def shm_gen(_tmp_dir=path.expanduser('~/.config/sshyp/tmp/')):  # creates a temporary directory for entry editing
+    _shm_folder_gen = ''.join(SystemRandom().choice(string.ascii_letters + string.digits)
+                              for _ in range(randint(10, 30)))
+    _shm_entry_gen = ''.join(SystemRandom().choice(string.ascii_letters + string.digits)
+                             for _ in range(randint(10, 30)))
+    Path(_tmp_dir + _shm_folder_gen).mkdir(0o700)
     return _shm_folder_gen, _shm_entry_gen
 
 
-def pass_gen():
+def pass_gen():  # generates and returns a random password based on user-specified options
     def _pass_gen_function(__complexity, __length):
         if __complexity.lower() == 's':
             __character_pool = string.ascii_letters + string.digits
         else:
             __character_pool = string.ascii_letters + string.digits + string.punctuation
-        __gen = ''.join(random.SystemRandom().choice(__character_pool) for _ in range(__length))
+        __gen = ''.join(SystemRandom().choice(__character_pool) for _ in range(__length))
         __min_special, __special = round(.2 * __length), 0
         for __character in __gen:
             if not __character.isalpha():
@@ -144,54 +136,78 @@ def pass_gen():
     return _gen
 
 
-def encrypt(_shm_folder, _shm_entry, _location):
-    system(f"{gpg} -qr {str(gpg_id)} -e '{tmp_dir}{_shm_folder}/{_shm_entry}'")
-    move(f"{tmp_dir}{_shm_folder}/{_shm_entry}.gpg", f"{directory}{_location}.gpg")
-    rmtree(f"{tmp_dir}{_shm_folder}")
+def encrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_com, _gpg_id, _tmp_dir=path.expanduser('~/.config/sshyp/tmp/')):
+    # encrypts an entry and cleans up the temporary files
+    system(f"{_gpg_com} -qr {str(_gpg_id)} -e '{_tmp_dir}{_shm_folder}/{_shm_entry}'")
+    move(f"{_tmp_dir}{_shm_folder}/{_shm_entry}.gpg", f"{_entry_dir}.gpg")
+    rmtree(f"{_tmp_dir}{_shm_folder}")
 
 
-def decrypt(_entry_dir, _shm_folder, _shm_entry):
+def decrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_command, _tmp_dir=path.expanduser('~/.config/sshyp/tmp/')):
+    # decrypts an entry to a temporary directory
     if _shm_folder == 0 and _shm_entry == 0:
-        _command = f"{gpg} -qd --output /dev/null {path.expanduser('~/.config/sshyp/lock.gpg')}"
+        _command = f"{_gpg_command} -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:
+        _command = f"{_gpg_command} -qd --output {_tmp_dir}{_shm_folder}/{_shm_entry} {_entry_dir}.gpg"
+    try:
+        run(_command, shell=True, stderr=PIPE, check=True, close_fds=True)
+    except CalledProcessError:
         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])
-    open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'w').writelines(lines[3:])
-    system(f"nano {tmp_dir}{_shm_folder}/{_shm_entry}-n")
-    edit_notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n").read()
-    open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'a').write(edit_notes)
+def optimized_edit(_lines, _edit_data, _edit_line):  # ensures an edited entry is optimized for best compatibility
+    while len(_lines) < _edit_line + 1:
+        _lines += ['\n']
+    if _edit_data is not None:
+        _lines[_edit_line] = _edit_data.strip('\n').rstrip() + '\n'
+    for _num in range(len(_lines)):
+        if not _lines[_num].endswith('\n'):
+            _lines[_num] += '\n'
+    for _num in reversed(range(len(_lines))):
+        if _lines[_num] == '\n':
+            _lines = _lines[:-1]
+        elif _lines[_num].endswith('\n'):
+            _lines[_num] = _lines[_num].rstrip()
+            break
+        else:
+            break
+    return _lines
+
+
+def edit_note(_shm_folder, _shm_entry, _lines):  # edits the note attached to an entry
+    _reg_lines = _lines[0:3]
+    open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'w').writelines(_lines[3:])
+    system(f"{editor} {tmp_dir}{_shm_folder}/{_shm_entry}-n")
+    _new_notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n").readlines()
+    while len(_reg_lines) < 3:
+        _reg_lines += ['\n']
+    _noted_lines = _reg_lines + _new_notes
+    return _noted_lines
 
 
 def copy_name_check(_port, _username_ssh, _ip, _client_device_name):
+    # attempts to connect to the user's server via ssh to register the device for syncing
     _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:
+    try:
+        run(_command, shell=True, stderr=PIPE, check=True, close_fds=True)
+    except CalledProcessError:
         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
+    open(path.expanduser('~/.config/sshyp/ssh-error'), 'w').write('0')
+    return 0
 
-# argument-specific functions
+# BELOW - argument-specific functions
 
 
 def tweak():  # runs configuration wizard
+    _divider = f"\n{'=' * (get_terminal_size()[0] - int((.5 * get_terminal_size()[0])))}\n\n"
     # storage/config directory creation
-    Path(path.expanduser('~/.password-pasture')).mkdir(0o700, parents=True, exist_ok=True)
+    Path(path.expanduser('~/.local/share/sshyp')).mkdir(0o700, parents=True, exist_ok=True)
     Path(path.expanduser('~/.config/sshyp/devices')).mkdir(0o700, parents=True, exist_ok=True)
     if not Path(f"{path.expanduser('~/.config/sshyp/tmp')}").exists():
         if uname()[0] == 'Haiku' or uname()[0] == 'FreeBSD':
@@ -205,7 +221,8 @@ def tweak():  # runs configuration wizard
     if _device_type.lower() == 's':
         open(path.expanduser('~/.config/sshyp/sshyp-device'), 'w').write(_device_type)
         Path(path.expanduser('~/.config/sshyp/deleted')).mkdir(0o700, parents=True, exist_ok=True)
-        print('\nmake sure the ssh service is running and properly configured\n\nconfiguration complete\n')
+        print(f"\n\u001b[4;1mmake sure the ssh service is running and properly configured\u001b[0m\n"
+              f"{_divider}configuration complete\n")
         s_exit(0)
     else:
         # device type configuration
@@ -213,57 +230,75 @@ 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 '
-                        'willing to use? (y/N) ')
-        if _gpg_id.lower() != 'y':
-            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: '))
-        open(path.expanduser('~/.config/sshyp/sshyp-gpg'), 'w').write(_gpg_id + '\n')
+        _gpg_id = input(f"{_divider}sshyp requires the use of a unique gpg key - use an (e)xisting key or (g)enerate "
+                        f"a new one? (E/g) ")
+        if _gpg_id.lower() != 'g':
+            system(f"{gpg} -k")
+            _gpg_id = str(input('gpg key id: '))
+        else:
+            print('\na unique gpg key is being generated for you...')
+            if not Path(path.expanduser('~/.config/sshyp/gpg-gen')).is_file():
+                open(path.expanduser('~/.config/sshyp/gpg-gen'), 'w').writelines([
+                    'Key-Type: 1\n', 'Key-Length: 4096\n', 'Key-Usage: sign encrypt\n', 'Name-Real: sshyp\n',
+                    'Name-Comment: gpg-sshyp\n', 'Name-Email: https://github.com/rwinkhart/sshyp\n', 'Expire-Date: 0'])
+            if uname()[0] == 'Haiku':
+                run(gpg + ' --batch --generate-key --passphrase ' + "'" +
+                    input('\ngpg passphrase: ') + "'" + " '" +
+                    path.expanduser('~/.config/sshyp/gpg-gen') + "'", shell=True)
+            else:
+                run(f"{gpg} --batch --generate-key '{path.expanduser('~/.config/sshyp/gpg-gen')}'", shell=True)
+            remove(path.expanduser('~/.config/sshyp/gpg-gen'))
+            _gpg_id = run(f"{gpg} -k", shell=True, stdout=PIPE, text=True).stdout.split('\n')[-4].strip()
 
         # lock file generation
+        if Path(path.expanduser('~/.config/sshyp/lock.gpg')).is_file():
+            remove(path.expanduser('~/.config/sshyp/lock.gpg'))
         open(path.expanduser('~/.config/sshyp/lock'), 'w')
         system(f"{gpg} -qr {str(_gpg_id)} -e {path.expanduser('~/.config/sshyp/lock')}")
-        remove(f"{path.expanduser('~/.config/sshyp')}/lock")
+        remove(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'
-                          '\n\nsync support requires a unique ssh key - would you like to have this automatically '
-                          'generated? (Y/n) '))
+        _ssh_gen = (input(f"{_divider}make sure the ssh service on the remote server is running and properly "
+                          f"configured\n\nsync support requires a unique ssh key - would you like to have this "
+                          f"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"\n\u001b[4;1mensure that the key file you are using is located at "
+                  f"{path.expanduser('~/.ssh/sshyp')}\u001b[0m")
 
         # ssh ip+port configuration
-        _ip_port = str(input('\nexample input: 10.10.10.10:9999\n\nip and ssh port of the remote server: '))
+        _ip_port = str(input(f"{_divider}example input: 10.10.10.10:9999\n\nip and ssh port of the remote server: "))
         _ip, _sep, _port = _ip_port.partition(':')
 
         # ssh user configuration
         _username_ssh = str(input('\nusername of the remote server: '))
-        print(f"\nentry directory: /home/{_username_ssh}/.password-pasture/")
+
+        # sshyp-only data storage
+        open(path.expanduser('~/.config/sshyp/sshyp-data'), 'w')\
+            .write(_gpg_id + '\n' + input(f"{_divider}example input: vim\n\npreferred text editor: "))
 
         # sshync profile generation
         sshync.make_profile(path.expanduser('~/.config/sshyp/sshyp.sshync'),
-                            path.expanduser('~/.password-pasture/'), f"/home/{_username_ssh}/.password-pasture/",
+                            path.expanduser('~/.local/share/sshyp/'), f"/home/{_username_ssh}/.local/share/sshyp/",
                             path.expanduser('~/.ssh/sshyp'), _ip, _port, _username_ssh)
 
         # 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('\n\u001b[4;1mimportant:\u001b[0m This name \u001b[4;1mmust\u001b[0m be unique amongst your client '
-              'devices\n\nthis is used to keep track of which devices have up-to-date databases.\n')
+        print(f"{_divider}\u001b[4;1mimportant:\u001b[0m this name \u001b[4;1mmust\u001b[0m be unique amongst your "
+              f"client devices\n\nthis is used to keep track of which devices have up-to-date databases\n")
         _client_device_name = str(input('device name: '))
         open(f"{path.expanduser('~/.config/sshyp/devices/')}{_client_device_name}", 'w')
         copy_name_check(_port, _username_ssh, _ip, _client_device_name)
 
-        print('\nconfiguration complete\n')
+        print(f"{_divider}configuration complete\n")
 
 
 def print_info():  # prints help text based on argument
-    if argument_list[0] == 'help' or argument_list[0] == '--help' or argument_list[0] == '-h':
+    if argument_list[1] == 'help' or argument_list[1] == '--help' or argument_list[1] == '-h':
         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 "
               "comes with absolutely no warranty;\ntype `sshyp license' for details")
@@ -297,7 +332,7 @@ def print_info():  # prints help text based on argument
         print('gen:')
         print(' update/-u               generate a password for an existing entry\n')
         print("\u001b[1mtip:\u001b[0m you can quickly read an entry with 'sshyp /<entry name>'")
-    elif argument_list[0] == 'version' or argument_list[0] == '-v':
+    elif argument_list[1] == 'version' or argument_list[1] == '-v':
         print('\nsshyp is a simple, self-hosted, sftp-synchronized password manager\nfor unix(-like) systems (haiku/'
               'freebsd/linux/termux)\n\nsshyp is a viable alternative to (and compatible with) pass/password-store\n')
         print("                ..       \u001b[38;5;9m♥♥ ♥♥\u001b[0m       ..\n         .''.''/()\\     \u001b[38;5;13m"
@@ -311,29 +346,29 @@ def print_info():  # prints help text based on argument
               'randall winkhart\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[38;5;15;48;5;15m                    \u001b[38;5;15;48;5;8mversion 1.0.0'
+        print('\u001b[38;5;7;48;5;8m/\u001b[38;5;15;48;5;15m                    \u001b[38;5;15;48;5;8mversion 1.1.1'
               '\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;15;48;5;8mthe sheecrets '
+              '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':
+    elif argument_list[1] == '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_list[0] == 'add':
+    elif argument_list[1] == 'add':
         print('\n\u001b[1musage:\u001b[0m sshyp add [flag [<entry name>]]\u001b[0m\n')
         print('\u001b[1mflags:\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_list[0] == 'edit':
+    elif argument_list[1] == 'edit':
         print('\n\u001b[1musage:\u001b[0m sshyp edit [flag [<entry name>]]\u001b[0m\n')
         print('\u001b[1mflags:\u001b[0m')
         print('edit:')
@@ -342,7 +377,7 @@ def print_info():  # prints help text based on argument
         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_list[0] == 'copy':
+    elif argument_list[1] == 'copy':
         print('\n\u001b[1musage:\u001b[0m sshyp copy [flag [<entry name>]]\u001b[0m\n')
         print('\u001b[1mflags:\u001b[0m')
         print('copy:')
@@ -359,7 +394,7 @@ def no_arg():  # displays a list of entries and gives an option to select one fo
         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()
-    decrypt(directory + _entry_name, _shm_folder, _shm_entry)
+    decrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg)
     entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
     rmtree(f"{tmp_dir}{_shm_folder}")
 
@@ -369,7 +404,7 @@ def read_shortcut():  # shortcut to quickly read an entry
         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()
-    decrypt(directory + argument.replace('/', '', 1), _shm_folder, _shm_entry)
+    decrypt(directory + argument.replace('/', '', 1), _shm_folder, _shm_entry, gpg)
     entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
     rmtree(f"{tmp_dir}{_shm_folder}")
 
@@ -392,7 +427,7 @@ def sync():  # calls sshync to sync changes to the user's server
             try:
                 if silent_sync != 1:
                     print(f"\u001b[38;5;208m{_file[:-1]}\u001b[0m has been sheared, removing...")
-                rmtree(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}")
+                rmtree(f"{directory}{_file[:-1]}")
             except FileNotFoundError:
                 if silent_sync != 1:
                     print('folder does not exist locally.')
@@ -400,7 +435,7 @@ def sync():  # calls sshync to sync changes to the user's server
             try:
                 if silent_sync != 1:
                     print(f"\u001b[38;5;208m{_file[:-1]}\u001b[0m has been sheared, removing...")
-                remove(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}.gpg")
+                remove(f"{directory}{_file[:-1]}.gpg")
             except (FileNotFoundError, IsADirectoryError):
                 if silent_sync != 1:
                     print('file does not exist locally.')
@@ -419,7 +454,7 @@ def sync():  # calls sshync to sync changes to the user's server
         if Path(f"{path.expanduser('~')}{_folder[:-1]}").is_dir():
             pass
         else:
-            print(f"\u001b[38;5;2m{_folder.replace('/.password-pasture/', '')[:-1]}/\u001b[0m does not exist locally, "
+            print(f"\u001b[38;5;2m{_folder.replace('/.local/share/sshyp/', '')[:-1]}/\u001b[0m does not exist locally, "
                   f"creating...")
             Path(f"{path.expanduser('~')}{_folder[:-1]}").mkdir(0o700, parents=True, exist_ok=True)
     # set permissions before uploading
@@ -430,38 +465,38 @@ 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 len(argument_list) < 3:
+    if len(argument_list) < 4:
         _entry_name = entry_name_fetch('name of new entry: ')
     else:
         _entry_name = entry_name_fetch(2)
     if Path(f"{directory}{_entry_name}.gpg").is_file():
         print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) already exists\u001b[0m\n")
         s_exit(1)
-    if argument_list[1] == 'note' or argument_list[1] == '-n':
+    if argument_list[2] == 'note' or argument_list[2] == '-n':
         _shm_folder, _shm_entry = shm_gen()
-        system(f"nano {tmp_dir}{_shm_folder}/{_shm_entry}-n")
+        system(f"{editor} {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_list[1] == 'password' or argument_list[1] == '-p':
+        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(optimized_edit(['', '', '', _notes], None, -1))
+    elif argument_list[2] == 'password' or argument_list[2] == '-p':
         _username = str(input('username: '))
         _password = str(input('password: '))
         _url = str(input('url: '))
         _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")
+            system(f"{editor} {tmp_dir}{_shm_folder}/{_shm_entry}-n")
             _notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'r').read()
         else:
             _notes = ''
-        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_password + '\n' + _username + '\n' + _url +
-                                                                     '\n' + _notes)
-        print('\n\u001b[1mentry preview:\u001b[0m')
-        entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
-    encrypt(_shm_folder, _shm_entry, _entry_name)
+        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w')\
+            .writelines(optimized_edit([_password, _username, _url, _notes], None, -1))
+    print('\n\u001b[1mentry preview:\u001b[0m')
+    entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
+    encrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg, gpg_id)
 
 
 def add_folder():  # creates a new folder
-    if len(argument_list) < 3:
+    if len(argument_list) < 4:
         _entry_name = entry_name_fetch('name of new folder: ')
     else:
         _entry_name = entry_name_fetch(2)
@@ -494,8 +529,8 @@ 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 len(argument_list) < 3:
+    _shm_folder, _shm_entry, _detail, _edit_line = None, None, None, None  # sets values to avoid PEP8 warnings
+    if len(argument_list) < 4:
         _entry_name = entry_name_fetch('entry to edit: ')
     else:
         _entry_name = entry_name_fetch(2)
@@ -503,44 +538,38 @@ def edit():  # edits the contents of an entry
         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()
-    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()
-    if len(_lines) < 3:
-        while len(_lines) < 3:
-            _lines.append('\n')
-        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_lines)
-
-    if argument_list[1] == 'username' or argument_list[1] == '-u':
-        _detail = str(input('new username: '))
-        replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 1, _detail + '\n')
-    elif argument_list[1] == 'password' or argument_list[1] == '-p':
-        _detail = str(input('new password: '))
-        replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 0, _detail + '\n')
-    elif argument_list[1] == 'url' or argument_list[1] == '-l':
-        _detail = str(input('new url: '))
-        replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 2, _detail + '\n')
-    elif argument_list[1] == 'note' or argument_list[1] == '-n':
-        edit_note(_shm_folder, _shm_entry)
+    decrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg)
+    if argument_list[2] == 'username' or argument_list[2] == '-u':
+        _detail, _edit_line = str(input('username: ')), 1
+    elif argument_list[2] == 'password' or argument_list[2] == '-p':
+        _detail, _edit_line = str(input('password: ')), 0
+    elif argument_list[2] == 'url' or argument_list[2] == '-l':
+        _detail, _edit_line = str(input('url: ')), 2
+    if argument_list[2] == 'note' or argument_list[2] == '-n':
+        _edit_line = 2
+        _new_lines = optimized_edit(edit_note(_shm_folder, _shm_entry,
+                                              open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines()), None, -1)
+    else:
+        _new_lines = optimized_edit(open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines(), _detail, _edit_line)
+    open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_new_lines)
     remove(f"{directory}{_entry_name}.gpg")
     print('\n\u001b[1mentry preview:\u001b[0m')
     entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
-    encrypt(_shm_folder, _shm_entry, _entry_name)
+    encrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg, gpg_id)
 
 
 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':
         _entry_name = entry_name_fetch('name of entry: ')
-    elif argument_list[1] == 'update' or argument_list[1] == '-u':
+    elif argument_list[2] == 'update' or argument_list[2] == '-u':
         _entry_name = entry_name_fetch(2)
         if not Path(f"{directory}{_entry_name}.gpg").is_file():
             print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) does not exist\u001b[0m\n")
             s_exit(1)
     else:
         _entry_name = entry_name_fetch(1)
-    if len(argument_list) == 1 or (not argument_list[1] == 'update' and not argument_list[1] == '-u'):
+    if len(argument_list) == 2 or (not argument_list[2] == 'update' and not argument_list[2] == '-u'):
         if Path(f"{directory}{_entry_name}.gpg").is_file():
             print(f"\n\u001b[38;5;9merror: entry ({_entry_name}) already exists\u001b[0m\n")
             s_exit(1)
@@ -550,28 +579,25 @@ def gen():  # generates a password for a new or an existing entry
         _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")
+            system(f"{editor} {tmp_dir}{_shm_folder}/{_shm_entry}-n")
             _notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'r').read()
         else:
             _notes = ''
-        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_password + '\n' + _username + '\n' + _url + '\n'
-                                                                     + _notes)
-        print('\n\u001b[1mentry preview:\u001b[0m')
-        entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
-        encrypt(_shm_folder, _shm_entry, _entry_name)
+        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w')\
+            .writelines(optimized_edit([_password, _username, _url, _notes], None, -1))
     else:
-        _password = pass_gen()
         _shm_folder, _shm_entry = shm_gen()
-        decrypt(directory + _entry_name, _shm_folder, _shm_entry)
-        replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 0, _password + '\n')
+        decrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg)
+        _new_lines = optimized_edit(open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines(), pass_gen(), 0)
+        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_new_lines)
         remove(f"{directory}{_entry_name}.gpg")
-        print('\n\u001b[1mentry preview:\u001b[0m')
-        entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
-        encrypt(_shm_folder, _shm_entry, _entry_name)
+    print('\n\u001b[1mentry preview:\u001b[0m')
+    entry_reader(f"{tmp_dir}{_shm_folder}/{_shm_entry}")
+    encrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg, gpg_id)
 
 
 def copy_data():  # copies a specified field of an entry to the clipboard
-    if len(argument_list) < 3:
+    if len(argument_list) < 4:
         _entry_name = entry_name_fetch('entry to copy: ')
     else:
         _entry_name = entry_name_fetch(2)
@@ -579,48 +605,48 @@ def copy_data():  # copies a specified field of an entry to the clipboard
         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()
-    decrypt(directory + _entry_name, _shm_folder, _shm_entry)
+    decrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg)
     _copy_line = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines()
     if uname()[0] == 'Haiku':  # Haiku clipboard detection
-        if argument_list[1] == 'username' or argument_list[1] == '-u':
+        if argument_list[2] == 'username' or argument_list[2] == '-u':
             system('clipboard -c ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'password' or argument_list[1] == '-p':
+        elif argument_list[2] == 'password' or argument_list[2] == '-p':
             system('clipboard -c ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'url' or argument_list[1] == '-l':
+        elif argument_list[2] == 'url' or argument_list[2] == '-l':
             system('clipboard -c ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'note' or argument_list[1] == '-n':
+        elif argument_list[2] == 'note' or argument_list[2] == '-n':
             system('clipboard -c ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'")
-        Popen('sleep 30; clipboard -r', shell=True)
+        Popen('sleep 30; clipboard -r', shell=True, close_fds=True)
     elif Path("/data/data/com.termux").exists():  # Termux (Android) clipboard detection
-        if argument_list[1] == 'username' or argument_list[1] == '-u':
+        if argument_list[2] == 'username' or argument_list[2] == '-u':
             system('termux-clipboard-set ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'password' or argument_list[1] == '-p':
+        elif argument_list[2] == 'password' or argument_list[2] == '-p':
             system('termux-clipboard-set ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'url' or argument_list[1] == '-l':
+        elif argument_list[2] == 'url' or argument_list[2] == '-l':
             system('termux-clipboard-set ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'note' or argument_list[1] == '-n':
+        elif argument_list[2] == 'note' or argument_list[2] == '-n':
             system('termux-clipboard-set ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'")
-        Popen("sleep 30; termux-clipboard-set ''", shell=True)
+        Popen("sleep 30; termux-clipboard-set ''", shell=True, close_fds=True)
     elif environ.get('WAYLAND_DISPLAY') == 'wayland-0':  # Wayland clipboard detection
-        if argument_list[1] == 'username' or argument_list[1] == '-u':
+        if argument_list[2] == 'username' or argument_list[2] == '-u':
             system('wl-copy ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'password' or argument_list[1] == '-p':
+        elif argument_list[2] == 'password' or argument_list[2] == '-p':
             system('wl-copy ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'url' or argument_list[1] == '-l':
+        elif argument_list[2] == 'url' or argument_list[2] == '-l':
             system('wl-copy ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'")
-        elif argument_list[1] == 'note' or argument_list[1] == '-n':
+        elif argument_list[2] == 'note' or argument_list[2] == '-n':
             system('wl-copy ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'")
-        Popen('sleep 30; wl-copy -c', shell=True)
+        Popen('sleep 30; wl-copy -c', shell=True, close_fds=True)
     else:  # X11 clipboard detection
-        if argument_list[1] == 'username' or argument_list[1] == '-u':
+        if argument_list[2] == 'username' or argument_list[2] == '-u':
             system('echo -n ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        elif argument_list[1] == 'password' or argument_list[1] == '-p':
+        elif argument_list[2] == 'password' or argument_list[2] == '-p':
             system('echo -n ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        elif argument_list[1] == 'url' or argument_list[1] == '-l':
+        elif argument_list[2] == 'url' or argument_list[2] == '-l':
             system('echo -n ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        elif argument_list[1] == 'note' or argument_list[1] == '-n':
+        elif argument_list[2] == 'note' or argument_list[2] == '-n':
             system('echo -n ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
-        Popen("sleep 30; echo -n '' | xclip -sel c", shell=True)
+        Popen("sleep 30; echo -n '' | xclip -sel c", shell=True, close_fds=True)
     rmtree(f"{tmp_dir}{_shm_folder}")
 
 
@@ -629,7 +655,7 @@ def remove_data():  # deletes an entry from the server and flags it for local de
         _entry_name = entry_name_fetch('entry/folder to shear: ')
     else:
         _entry_name = entry_name_fetch(1)
-    decrypt(path.expanduser('~/.config/sshyp/lock.gpg'), 0, 0)
+    decrypt(path.expanduser('~/.config/sshyp/lock.gpg'), 0, 0, gpg)
     system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"cd /bin; python -c "
            f"'import sshypRemote; sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"")
 
@@ -638,11 +664,8 @@ if __name__ == "__main__":
     try:
         silent_sync, ssh_error = 0, 0
         # retrieve typed argument
-        argument_list, argument = argv, ''
-        del argument_list[0]
-        for _argument in argument_list:
-            argument += _argument + ' '
-        argument = argument[:-1]
+        argument_list = argv
+        argument = ' '.join(argument_list[1:])
         if uname()[0] == 'Haiku':  # set proper gpg command for OS
             gpg = 'gpg --pinentry-mode loopback'
         else:
@@ -660,12 +683,17 @@ if __name__ == "__main__":
                     ip = ssh_info[1].replace('\n', '')
                     port = ssh_info[2].replace('\n', '')
                     directory = str(ssh_info[3].replace('\n', ''))
-                    directory_ssh = '/home/' + username_ssh + '/.password-pasture/'
+                    directory_ssh = str(ssh_info[4].replace('\n', ''))
                     client_device_name = listdir(path.expanduser('~/.config/sshyp/devices'))[0]
-                    gpg_id = open(path.expanduser('~/.config/sshyp/sshyp-gpg')).read().strip()
+                    sshyp_data = open(path.expanduser('~/.config/sshyp/sshyp-data')).readlines()
+                    gpg_id = sshyp_data[0].replace('\n', '')
+                    editor = sshyp_data[1].replace('\n', '')
                     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)
+                else:
+                    print('running as server, option disabled')
+                    s_exit(0)
             except (FileNotFoundError, IndexError):
                 if device_type.lower() != 's':
                     print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
@@ -684,53 +712,53 @@ if __name__ == "__main__":
         elif argument == 'help' or argument == '--help' or argument == '-h' or argument == 'license' or argument \
                 == 'version' or argument == '-v':
             print_info()
-        elif argument_list[0] == 'add':
-            if len(argument_list) == 1:
+        elif argument_list[1] == 'add':
+            if len(argument_list) == 2:
                 print_info()
-            elif argument_list[1] == 'note' or argument_list[1] == '-n' or argument_list[1] == 'password' or \
-                    argument_list[1] == '-p':
+            elif argument_list[2] == 'note' or argument_list[2] == '-n' or argument_list[2] == 'password' or \
+                    argument_list[2] == '-p':
                 add_entry()
-            elif argument_list[1] == 'folder' or argument_list[1] == '-f':
+            elif argument_list[2] == 'folder' or argument_list[2] == '-f':
                 add_folder()
             else:
                 print_info()
                 s_exit(0)
-        elif argument_list[0] == 'edit':
-            if len(argument_list) == 1:
+        elif argument_list[1] == 'edit':
+            if len(argument_list) == 2:
                 print_info()
-            elif argument_list[1] == 'rename' or argument_list[1] == 'relocate' or argument_list[1] == '-r':
+            elif argument_list[2] == 'rename' or argument_list[2] == 'relocate' or argument_list[2] == '-r':
                 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':
+            elif argument_list[2] == 'username' or argument_list[2] == '-u' or argument_list[2] == 'password' or \
+                    argument_list[2] == '-p' or argument_list[2] == 'url' or argument_list[2] == '-l' or \
+                    argument_list[2] == 'note' or argument_list[2] == '-n':
                 edit()
             else:
                 print_info()
                 s_exit(0)
-        elif argument_list[0] == 'gen':
+        elif argument_list[1] == 'gen':
             gen()
-        elif argument_list[0] == 'copy':
-            if len(argument_list) == 1:
+        elif argument_list[1] == 'copy':
+            if len(argument_list) == 2:
                 print_info()
-            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':
+            elif argument_list[2] == 'username' or argument_list[2] == '-u' or argument_list[2] == 'password' or \
+                    argument_list[2] == '-p' or argument_list[2] == 'url' or argument_list[2] == '-l' or \
+                    argument_list[2] == 'note' or argument_list[2] == '-n':
                 copy_data()
             else:
                 print_info()
-        elif argument_list[0] == 'shear' or argument_list[0] == '-rm':
+        elif argument_list[1] == 'shear' or argument_list[1] == '-rm':
             remove_data()
-        elif argument_list[0] != 'sync' and argument_list[0] != '-s':
+        elif argument_list[1] != 'sync' and argument_list[1] != '-s':
             print(f"\n\u001b[38;5;9merror: invalid argument - run 'sshyp help' to list usable commands\u001b[0m\n")
             s_exit(1)
 
         # sync if any changes were made
-        if len(argument_list) > 0 and ssh_error == 0 and \
-                ((argument_list[0] == 'sync' or argument_list[0] == '-s' or argument_list[0] == 'gen' or
-                  argument_list[0] == 'shear' or argument_list[0] == '-rm') or ((argument_list[0] == 'add'
-                                                                                 or argument_list[0] == 'edit')
-                                                                                and len(argument_list) > 1)):
+        if len(argument_list) > 1 and ssh_error == 0 and \
+                ((argument_list[1] == 'sync' or argument_list[1] == '-s' or argument_list[1] == 'gen' or
+                  argument_list[1] == 'shear' or argument_list[1] == '-rm') or ((argument_list[1] == 'add'
+                                                                                 or argument_list[1] == 'edit')
+                                                                                and len(argument_list) > 2)):
             sync()
 
         s_exit(0)

bin/sshypRemote.py

@@ -9,22 +9,22 @@ from shutil import rmtree
 
 # utility functions
 
-def delete(_file_path):
+def delete(_file_path):  # deletes an entry or folder, should be run remotely via ssh
     if _file_path.endswith('/'):
         try:
-            rmtree(f"{expanduser('~/.password-pasture/')}{_file_path}")
+            rmtree(f"{expanduser('~/.local/share/sshyp/')}{_file_path}")
         except FileNotFoundError:
             print('folder does not exist remotely')
     else:
         try:
-            remove(f"{expanduser('~/.password-pasture/')}{_file_path}.gpg")
+            remove(f"{expanduser('~/.local/share/sshyp/')}{_file_path}.gpg")
         except FileNotFoundError:
             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')
 
 
-def deletion_check(_client_device_name):
+def deletion_check(_client_device_name):  # creates a list of entries and folders to be deleted from a local machine
     open(expanduser('~/.config/sshyp/deletion_database'), 'w').write('')
     for _file in listdir(expanduser('~/.config/sshyp/deleted')):
         _file_path = _file.replace('@', '/').split('^&*')[0]
@@ -37,9 +37,9 @@ def deletion_check(_client_device_name):
             open(expanduser('~/.config/sshyp/deletion_database'), 'a').write(_file_path + '\n')
 
 
-def folder_check():
+def folder_check():  # creates a list of folders to be compared with those of a local machine
     open(expanduser('~/.config/sshyp/folder_database'), 'w').write('')
-    for _root, _directories, _files in walk(expanduser('~/.password-pasture')):
+    for _root, _directories, _files in walk(expanduser('~/.local/share/sshyp')):
         for _dir in _directories:
             open(expanduser('~/.config/sshyp/folder_database'), 'a')\
                 .write(f"{_root.replace(expanduser('~'), '')}/{_dir}\n")

extra/changelog-total

@@ -1,3 +1,80 @@
+sshyp v1.1.1
+
+the sheecrets update - patch one
+
+this is a polish/bug fix release that makes tweaks to the entry format (without breaking compatibility)
+
+compatibility-breaking changes:
+
+- none; the entry format tweaks are backward compatible with sshyp v1.0.0+
+    ^ the new format is slightly more efficient in terms of storage space
+        ^ if you would like to upgrade to it, run this script (after updating to v1.1.1):
+          https://raw.githubusercontent.com/rwinkhart/sshyp-labs/main/extra/conversion-scripts/sshyp-refresh-1.1.1%2B.py
+
+user-facing features:
+
+- entries (when editing or adding) are now run through the new optimized_edit() function to strip trailing new lines
+and ensure the format of the entries is fully compatible with all of sshyp's functions
+
+fixes:
+
+- when adding a note to an entry, there is no longer a chance the first note line will be added as a url
+if the entry is using an older format/pass format
+- the gpg auto-generation file temporarily created by sshyp no longer includes extra spaces
+    ^ seems to serve no functional purpose - fixed for the sake of polish
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+sshyp v1.1.0
+
+the sheecrets update
+
+the main focus of this release was adding extension support (particularly for sshyp-mfa)
+and cleaning up the configuration experience
+
+compatibility-breaking changes:
+
+- the entry directory has been moved from ~/.password-pasture to ~/.local/share/sshyp
+as a means of complying with the XDG base directory spec
+    ^ this requires the user to move their entry directory to the new location manually
+        ^ if this is not done, sshyp will not be able to find entries made prior to v1.1.0
+- due to a new configuration option (preferred text editor), 'sshyp tweak' must be run after updating
+
+user-facing features:
+
+- extension support
+    ^ some of sshyp's critical functions can now be imported into other programs to extend
+    upon sshyp's functionality
+        ^ the first usecase of this is sshyp-mfa, which can be found at https://github.com/rwinkhart/sshyp-labs
+- a new configuration experience
+    ^ the 'sshyp tweak' menu has been made much more readable, and now the automatically generated
+    gpg key has its id automatically input, making the process easier for the user
+- customizable text editor
+    ^ the text editor used for editing notes can now be set to any editor preferred by the user
+        ^ this means that nano was dropped as a dependency
+
+fixes:
+
+- to avoid exceptions on server devices, all arguments (apart from 'tweak') have been disabled on servers
+- fixed entry readout not printing blank lines between fields under certain conditions
+- various optimizations
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+sshyp v1.0.1
+
+The Polished Trotters Update - Patch 1
+
+This is a hotfix for the Haiku decryption bug.
+
+Changes:
+
+- subprocess.Popen has been replaced with subprocess.run where applicable
+- stdout is no longer captured with any subprocess.Popen or subprocess.run usages
+    ^ this fixes decryption on Haiku
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
 sshyp v1.0.0
 
 The Polished Trotters Update

extra/manpage

@@ -1,4 +1,4 @@
-.TH sshyp 1 "20 June 2022" "v1.0.0" "sshyp man page"
+.TH sshyp 1 "21 July 2022" "v1.1.1" "sshyp man page"
 .SH NAME
 sshyp \- A very simple self-hosted, synchronized password manager for UNIX(-like) systems. Alternative to (and compatible with) pass/password-store.
 .SH SYNOPSIS
@@ -12,25 +12,25 @@ Setting up sshyp for the first time or altering its configuration (also recommen
 Viewing the entry database:
     sshyp
 
-Reading an existing entry saved as ~/.password-pasture/development/github.gpg:
+Reading an existing entry saved as ~/.local/share/sshyp/development/github.gpg:
     sshyp /development/github
 
-Copying the password of an existing entry saved as ~/.password-pasture/financial/bank.gpg:
+Copying the password of an existing entry saved as ~/.local/share/sshyp/financial/bank.gpg:
     sshyp copy -p /financial/bank
 
-Editing the username of an existing entry saved as ~/.password-pasture/game.gpg:
+Editing the username of an existing entry saved as ~/.local/share/sshyp/game.gpg:
     sshyp edit -u game
 
-Making a new entry saved as ~/.password-pasture/school/university.gpg using the built-in password generator:
+Making a new entry saved as ~/.local/share/sshyp/school/university.gpg using the built-in password generator:
     sshyp gen /school/university
 
-Creating a note-only entry saved as ~/.password-pasture/notes/testNote.gpg:
+Creating a note-only entry saved as ~/.local/share/sshyp/notes/testNote.gpg:
     sshyp add -n /notes/testNote
 
 Manually syncing entries with the server:
     sshyp sync
 
-Removing an existing folder saved as ~/.password-pasture/social:
+Removing an existing folder saved as ~/.local/share/sshyp/social:
     sshyp shear social/
 
 .SH OPTIONS

extra/sshyp-convert-v1.0.0.py

@@ -1,48 +0,0 @@
-#!/bin/python3
-
-from os import path, remove, system, walk
-from pathlib import Path
-from shutil import move, rmtree
-
-if __name__ == "__main__":
-    gpg_id = input('\nWhat is the ID of the GPG key you would like to use for re-encryption?\n\nID: ')
-    pasture = path.expanduser('~/.password-pasture')
-    if Path(f"{pasture}.new").exists():
-        rmtree(f"{pasture}.new")
-    if Path(f"{pasture}.old").exists():
-        rmtree(f"{pasture}.old")
-    if path.isdir(pasture):
-        for dirPath, dirNames, filenames in walk(pasture):
-            for filename in sorted(filenames):
-                Path(dirPath.replace(pasture, pasture + '.new')).mkdir(0o700, parents=True, exist_ok=True)
-                system(f"gpg -d '{dirPath}/{filename}' "
-                       f"> '{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}'")
-                _old_contents, _new_contents = \
-                    open(f"{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}", 'r').readlines(), ''
-                for _num in range(len(_old_contents)):
-                    if _num == 0:
-                        try:
-                            _new_contents += _old_contents[1]
-                        except IndexError:
-                            _new_contents += '\n'
-                    elif _num == 1:
-                        _new_contents += _old_contents[0]
-                    elif _num == 3:
-                        if _old_contents[_num] == ' ' or _old_contents[_num] == '\n':
-                            pass
-                        else:
-                            _new_contents += _old_contents[_num]
-                    else:
-                        _new_contents += _old_contents[_num]
-                for _num in reversed(range(len(_new_contents))):
-                    if _new_contents[_num] == '\n' or _new_contents[_num] == '':
-                        _new_contents = _new_contents[:-1]
-                    else:
-                        break
-                open(f"{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}", 'w').writelines(_new_contents)
-                system(f"gpg -qr {str(gpg_id)} -e '{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}'")
-                remove(f"{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}")
-    else:
-        print(f"\nError: no entry folder ({pasture}) found\n")
-    move(pasture, f"{pasture}.old")
-    move(f"{pasture}.new", pasture)

extra/sshyp-linux-banner.png.REMOVED.git-id

@@ -1 +0,0 @@
-af6236472791614ed41bf13318a2d1c41228855c

extra/sshyp-refresh.py

@@ -1,41 +0,0 @@
-#!/bin/python3
-
-from os import path, remove, system, walk
-from pathlib import Path
-from shutil import move, rmtree
-
-if __name__ == "__main__":
-    gpg_id = input('\nWhat is the ID of the GPG key you would like to use for re-encryption?\n\nID: ')
-    pasture = path.expanduser('~/.password-pasture')
-    if Path(f"{pasture}.new").exists():
-        rmtree(f"{pasture}.new")
-    if Path(f"{pasture}.old").exists():
-        rmtree(f"{pasture}.old")
-    if path.isdir(pasture):
-        for dirPath, dirNames, filenames in walk(pasture):
-            for filename in sorted(filenames):
-                Path(dirPath.replace(pasture, pasture + '.new')).mkdir(0o700, parents=True, exist_ok=True)
-                system(f"gpg -d '{dirPath}/{filename}' "
-                       f"> '{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}'")
-                _old_contents, _new_contents = \
-                    open(f"{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}", 'r').readlines(), ''
-                for _num in range(len(_old_contents)):
-                    if _num == 3:
-                        if _old_contents[_num] == ' ' or _old_contents[_num] == '\n':
-                            pass
-                        else:
-                            _new_contents += _old_contents[_num]
-                    else:
-                        _new_contents += _old_contents[_num]
-                for _num in reversed(range(len(_new_contents))):
-                    if _new_contents[_num] == '\n' or _new_contents[_num] == '':
-                        _new_contents = _new_contents[:-1]
-                    else:
-                        break
-                open(f"{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}", 'w').writelines(_new_contents)
-                system(f"gpg -qr {str(gpg_id)} -e '{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}'")
-                remove(f"{dirPath.replace(pasture, pasture + '.new')}/{filename[:-4]}")
-    else:
-        print(f"\nError: no entry folder ({pasture}) found\n")
-    move(pasture, f"{pasture}.old")
-    move(f"{pasture}.new", pasture)

package.sh

@@ -55,13 +55,13 @@ requires {
 	gnupg
 	openssh
 	python3
-	nano
 }
 urls {
 	\"https://github.com/rwinkhart/sshyp\"
 }
 " > packages/haikutemp/.PackageInfo
     cp -r bin packages/haikutemp/
+    ln -s /bin/sshyp.py packages/haikutemp/bin/sshyp
     cp -r share/doc/sshyp/ packages/haikutemp/documentation/packages/
     cp -r share/licenses/sshyp/ packages/haikutemp/documentation/packages/
     cp extra/manpage packages/haikutemp/documentation/man/man1/sshyp.1
@@ -84,11 +84,12 @@ Section: utils
 Architecture: all
 Maintainer: Randall Winkhart <idgr at tutanota dot com>
 Description: A light-weight, self-hosted, synchronized password manager
-Depends: python3, gnupg, openssh-client, nano, xclip, wl-clipboard
+Depends: python3, gnupg, openssh-client, xclip, wl-clipboard
 Priority: optional
 Installed-Size: 185
 " > packages/debiantemp/sshyp_"$version"-"$revision"_all/DEBIAN/control
     cp -r bin packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/
+    ln -s /usr/bin/sshyp.py packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/bin/sshyp
     cp -r share packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/
     cp extra/manpage packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1/sshyp.1
     gzip packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1/sshyp.1
@@ -100,19 +101,19 @@ fi
 
 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
+    mkdir -p packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/{data/data/com.termux/files/usr/share/man/man1,DEBIAN}
     echo "Package: sshyp
 Version: $version
 Section: utils
 Architecture: all
 Maintainer: Randall Winkhart <idgr at tutanota dot com>
 Description: A light-weight, self-hosted, synchronized password manager
-Depends: python, gnupg, openssh, nano, termux-api, termux-am
+Depends: python, gnupg, openssh, termux-api, termux-am
 Priority: optional
 Installed-Size: 185
 " > packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/DEBIAN/control
     cp -r bin packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/
+    ln -s /data/data/com.termux/files/usr/bin/sshyp.py packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/bin/sshyp
     cp -r share packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/
     cp extra/manpage packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
     gzip packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
@@ -124,13 +125,14 @@ fi
 
 if [ "$distro" == "3" ] || [ "$distro" == "4" ] || [ "$distro" == "6" ] || [ "$distro" == "7" ] || [ "$distro" == "8" ]; then
     echo -e '\nPackaging as generic...\n'
-    mkdir -p packages/archtemp/usr/share/man/man1
-    cp -r bin packages/archtemp/usr/
-    cp -r share packages/archtemp/usr/
-    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/
-    rm -rf packages/archtemp
+    mkdir -p packages/generictemp/usr/share/man/man1
+    cp -r bin packages/generictemp/usr/
+    ln -s /usr/bin/sshyp.py packages/generictemp/usr/bin/sshyp
+    cp -r share packages/generictemp/usr/
+    cp extra/manpage packages/generictemp/usr/share/man/man1/sshyp.1
+    gzip packages/generictemp/usr/share/man/man1/sshyp.1
+    tar -C packages/generictemp -cvf packages/sshyp-"$version".tar.xz usr/
+    rm -rf packages/generictemp
     sha512="$(sha512sum packages/sshyp-"$version".tar.xz | awk '{print $1;}')"
     echo -e "\nsha512 sum:\n$sha512"
     echo -e "\nGeneric packaging complete.\n"
@@ -147,11 +149,11 @@ Release:        "$revision"
 Summary:        A light-weight, self-hosted, synchronized password manager
 BuildArch:      noarch
 
-License:        GPL3
+License:        GPLv3
 URL:            https://github.com/rwinkhart/sshyp
 Source0:        sshyp-"$version".tar.xz
 
-Requires:       python gnupg openssh nano wl-clipboard 
+Requires:       python gnupg openssh 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.
@@ -162,6 +164,7 @@ cp -r %{_sourcedir}/usr %{buildroot}
 
 %files
 /usr/bin/sshyp
+/usr/bin/sshyp.py
 /usr/bin/sshync.py
 /usr/bin/sshypRemote.py
 %license /usr/share/licenses/sshyp/license
@@ -196,9 +199,6 @@ prefix: /
                    \"gnupg\" : {
                       \"origin\" : \"security/gnupg\"
                    },
-                   \"nano\" : {
-                      \"origin\" : \"editors/nano\"
-                   },
                    \"xclip\" : {
                       \"origin\" : \"x11/xclip\"
                    },
@@ -210,6 +210,7 @@ prefix: /
 echo "/bin/python3
 /usr/bin/sshync.py
 /usr/bin/sshyp
+/usr/bin/sshyp.py
 /usr/bin/sshypRemote.py
 /usr/share/doc/sshyp/changelog
 /usr/share/licenses/sshyp/license
@@ -231,7 +232,7 @@ pkgdesc='A light-weight, self-hosted, synchronized password manager'
 url='https://github.com/rwinkhart/sshyp'
 arch=('any')
 license=('GPL3')
-depends=(python gnupg openssh nano xclip wl-clipboard)
+depends=(python gnupg openssh xclip wl-clipboard)
 
 source=(\""$source"\")
 sha512sums=('"$sha512"')

share/doc/sshyp/changelog

@@ -1,45 +1,29 @@
-sshyp v1.0.0
+sshyp v1.1.1
 
-The Polished Trotters Update
+the sheecrets update - patch one
 
-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.
+this is a polish/bug fix release that makes tweaks to the entry format (without breaking compatibility)
 
-Features:
+compatibility-breaking changes:
 
-- 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 Fedora Linux
-- 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
+- none; the entry format tweaks are backward compatible with sshyp v1.0.0+
+    ^ the new format is slightly more efficient in terms of storage space
+        ^ if you would like to upgrade to it, run this script (after updating to v1.1.1):
+          https://raw.githubusercontent.com/rwinkhart/sshyp-labs/main/extra/conversion-scripts/sshyp-refresh-1.1.1%2B.py
 
-Changes:
+user-facing features:
 
-- 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
-- entries will no longer be overwritten if attempting to create a new entry that uses an already existing name
-- 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!
+- entries (when editing or adding) are now run through the new optimized_edit() function to strip trailing new lines
+and ensure the format of the entries is fully compatible with all of sshyp's functions
+
+fixes:
+
+- when adding a note to an entry, there is no longer a chance the first note line will be added as a url
+if the entry is using an older format/pass format
+- the gpg auto-generation file temporarily created by sshyp no longer includes extra spaces
+    ^ seems to serve no functional purpose - fixed for the sake of polish
 
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
 The full history of changes to "sshyp" can be found on the following page:
 https://raw.githubusercontent.com/rwinkhart/sshyp/main/extra/changelog-total
-
-Legend:
-
--  = feature/change implemented and pushed upstream
-^  = note regarding the above feature/change