From a4368d60ebf8eaf701df89bbdb963283f0fecb42 Mon Sep 17 00:00:00 2001
From: Randall <idgr@tutanota.com>
Date: Sat, 16 Jul 2022 19:32:57 -0400
Subject: [PATCH] Fixed compatibility check not adding the correct number of
 lines under certain circumstances

---
 bin/sshyp.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/bin/sshyp.py b/bin/sshyp.py
index 981ed45..e5c8e04 100755
--- a/bin/sshyp.py
+++ b/bin/sshyp.py
@@ -162,12 +162,12 @@ def decrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_command, _tmp_dir=path.exp
 
 
 def edit_note(_shm_folder, _shm_entry):  # edits the note attached to an 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:])
+    _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"{editor} {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)
+    _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 copy_name_check(_port, _username_ssh, _ip, _client_device_name):
@@ -524,12 +524,13 @@ def edit():  # edits the contents of an entry
     _shm_folder, _shm_entry = shm_gen()
     decrypt(directory + _entry_name, _shm_folder, _shm_entry, gpg)
 
-    # compatibility check for GNU pass entries (ensuring they have at least four lines)
+    # compatibility fix for pass/incomplete sshyp entries
     _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)
+        _new_lines = 0
+        while len(_lines) + _new_lines < 3:
+            _new_lines += 1
+        open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'a').write((_new_lines * '\n') + '\n')
 
     if argument_list[2] == 'username' or argument_list[2] == '-u':
         _detail = str(input('new username: '))