Updated PKGBUILD for release

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Randall Winkhart <idgr at tutanota dot com>
 
 pkgname=sshyp
-pkgver=2021.12.01.fr2.1
+pkgver=2021.12.01.fr2.2
 pkgrel=1
 pkgdesc='A self-hosted, synchronized password manager'
 url='https://github.com/rwinkhart/sshyp'
@@ -9,10 +9,10 @@ arch=('x86_64' 'aarch64')
 license=('GPL3')
 depends=( python gnupg openssh nano xclip wl-clipboard)
 
-source_x86_64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.12.01.fr2.1/sshyp-2021.12.01.fr2.1.tar.xz')
-source_aarch64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.12.01.fr2.1/sshyp-2021.12.01.fr2.1.tar.xz')
-sha512sums_x86_64=('fdef7455fd48d190794d2323b3e8d75251d21a472cffb72757e1422c532731492234f250c292e6f27955f6670aa528c609ad786f4abab79a5b4a4d070ce6343b')
-sha512sums_aarch64=('fdef7455fd48d190794d2323b3e8d75251d21a472cffb72757e1422c532731492234f250c292e6f27955f6670aa528c609ad786f4abab79a5b4a4d070ce6343b')
+source_x86_64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.12.01.fr2.2/sshyp-2021.12.01.fr2.2.tar.xz')
+source_aarch64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.12.01.fr2.2/sshyp-2021.12.01.fr2.2.tar.xz')
+sha512sums_x86_64=('470f7b4fd2bb0cc34a98e8ab5506ae4bc82e311616e2a81ee4fc559dd9e2c2e46a05517a49ba4d4fe108f341f92250bd1d63acca134d277b37d2475e03713adf')
+sha512sums_aarch64=('470f7b4fd2bb0cc34a98e8ab5506ae4bc82e311616e2a81ee4fc559dd9e2c2e46a05517a49ba4d4fe108f341f92250bd1d63acca134d277b37d2475e03713adf')
 
 package() {
 

bin/sshync.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# sshync 2021.12.01.unreleased6
+# sshync 2021.12.01.unreleased7
 
 # external modules
 
@@ -17,7 +17,10 @@ def get_titles_mods(_directory, _destination, _user_data):
     if _destination == 'l':
         if type(_user_data) == str:
             _user_data = str(_user_data).strip('(').strip(')').replace(' ', '').split(',')
-        remove(_user_data[6] + 'sshync_database')
+        try:
+            remove(_user_data[6] + 'sshync_database')
+        except FileNotFoundError:
+            pass
         for _root, _directories, _files in walk(_directory):
             for _filename in _files:
                 _title_list.append(join(_root.replace(_directory, '', 1), _filename))
@@ -89,18 +92,18 @@ def run_profile(_profile_dir):
             # compare mod times and sync
             if int(_index_l[1][_i]) > int(_index_r[1][_i]):
                 print(f"[{_title}] Local is newer, uploading...")
-                system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
-                       f"{_user_data[4]}{_title} <<< $'put {_user_data[3]}{_title}'")
+                system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
+                       f"{_user_data[4]}{'/'.join(_title.split('/')[:-1]) + '/'} <<< $'put {_user_data[3]}{_title}'")
             elif int(_index_l[1][_i]) < int(_index_r[1][_i]):
                 print(f"[{_title}] Remote is newer, downloading...")
-                system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
-                       f"{_user_data[4]}{_title} {_user_data[3]}{_title}")
+                system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
+                       f"{_user_data[4]}{_title} {_user_data[3]}{'/'.join(_title.split('/')[:-1]) + '/'}")
         else:
             print(f"[{_title}] Not on remote server, uploading...")
-            system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
-                   f"{_title} <<< $'put {_user_data[3]}{_title}'")
+            system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
+                   f"{'/'.join(_title.split('/')[:-1]) + '/'} <<< $'put {_user_data[3]}{_title}'")
     for _title in _index_r[0]:
         if _title not in _index_l[0]:
             print(f"[{_title}] Not in local directory, downloading...")
-            system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
-                   f"{_title} {_user_data[3]}{_title}")
+            system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
+                   f"{_title} {_user_data[3]}{'/'.join(_title.split('/')[:-1]) + '/'}")

bin/sshyp

@@ -57,7 +57,8 @@ def tweak():  # runs configuration wizard
     if _device_type == 'S' or _device_type == 's':
         open("/var/lib/sshyp/sshyp-device", 'w').write(_device_type)
         copy('/usr/bin/sshync.py', f"/home/{environ.get('USER')}/")
-        print('\nMake sure the ssh service is running and properly configured.\n\nConfiguration complete!')
+        print('\nMake sure the ssh service is running and properly configured.\n\nConfiguration complete!\n')
+        s_exit()
     else:
         # device type configuration
         _device_type = 'c'  # ensure device type flag is properly set
@@ -147,7 +148,7 @@ def version():  # displays version information
     print('/                                                      /')
     print('/     sshyp  Copyright (C) 2021  Randall Winkhart      /')
     print('/                                                      /')
-    print('/              Version 2021.12.01.fr2.1                /')
+    print('/              Version 2021.12.01.fr2.2                /')
     print('/                 The Lighter Update                   /')
     print('/                                                      /')
     print('////////////////////////////////////////////////////////\n')

extra/changelog-total

@@ -1,5 +1,55 @@
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
+sshyp 2021.12.01.fr2.2
+
+The Lighter Update - Patch 2
+
+This release is a hotfix for 2021.12.01.fr2.1.
+
+Changes:
+
+- a major fix for "/var/lib/sshync_database" needing to already exist server-side
+- a major fix for syncing functionality  (it should actually work now)
+- silenced some sftp output
+
+An fr2.3 patch is planned for this version. It will include the following:
+
+- fixes for any new bugs that may be discovered in the new sshyp and sshync code
+- the gen command in sshyp will be updated to use the newer notetaking system
+- printing functions in sshyp will be combined into one function (arguments will determine section to print)
+- file not found exceptions will be re-implemented
+- when syncing, a check will be made to see if any folders are not on all devices and this will be corrected
+
+Planned for next major update (The Fluffier Update):
+
+- new visual features
+    ^ this includes the new file list and thematic text art. sshyp will be
+    getting a retro computing theme.
+- packages for more environments
+    ^ "sshyp" will be officially packaged for Arch Linux, Alpine Linux, and Termux (Android).
+    Debian/Ubuntu and Fedora packaging will come later.
+- imporove password generator to guarantee more secure results
+
+Planned for next, next major update (The Shears Update Pt. 1):
+
+- enforce permissions on the server-side
+- allow for copying entire notes (not just first line)
+- allow for multi-client deletion... somehow
+- detatch sshync and make it a separate package
+- manpage
+
+Planned for next, next, next major update (The Shears Update Pt. 2):
+
+- ability to pass entries as arguments for more functions
+- auto-completion on tab (currently unsure of best way to make this work)
+
+Backlog:
+
+- package for more Linux distributions, such as Debian and Fedora
+- create separate gui frontend targetting mobile and desktop Linux
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
 sshyp 2021.12.01.fr2.1
 
 The Lighter Update - Patch 1

share/doc/sshyp/changelog

@@ -1,22 +1,22 @@
-sshyp 2021.12.01.fr2.1
+sshyp 2021.12.01.fr2.2
 
-The Lighter Update - Patch 1
+The Lighter Update - Patch 2
 
-This release is a hotfix for 2021.12.01.fr2.
+This release is a hotfix for 2021.12.01.fr2.1.
 
 Changes:
 
-- fixed a bug where "sshyp tweak" would not function on new installations
-- moved the argument parser to the global process
-- running "sshyp version" or "sshyp -v" no longer triggers syncing
-- folders are now created natively with Python, rather than through system commands
+- a major fix for "/var/lib/sshync_database" needing to already exist server-side
+- a major fix for syncing functionality  (it should actually work now)
+- silenced some sftp output
 
-An fr2.2 patch is planned for this version. It will include the following:
+An fr2.3 patch is planned for this version. It will include the following:
 
 - fixes for any new bugs that may be discovered in the new sshyp and sshync code
 - the gen command in sshyp will be updated to use the newer notetaking system
 - printing functions in sshyp will be combined into one function (arguments will determine section to print)
 - file not found exceptions will be re-implemented
+- when syncing, a check will be made to see if any folders are not on all devices and this will be corrected
 
 Planned for next major update (The Fluffier Update):