From b9b83c61d306f1e27fb911ac161f43956040ca90 Mon Sep 17 00:00:00 2001
From: Kamal Curi <kamalcuri@outlook.com>
Date: Thu, 30 Dec 2021 01:59:00 -0300
Subject: [PATCH] FIX: Version 1.02

---
 CHANGELOG   |  5 ++++-
 README.md   | 10 +++++++---
 install.sh  | 17 +++++++++++++++++
 steelbox.py | 12 ++++++++----
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6e8912d..da40960 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,7 +23,10 @@
     · Minor bug fixes:
         · ITEM_CURSOR and GLOBAL_CURSOR now behave properly under all(tested) circumstances
     · Added random string to modify password
-- 1.01
+- 1.01 (Added and removed)
+- 1.02
+    · Added uninstall option (Quite frankly I wonder what took me so long to get this done)
+    · Minor UI fixes
     · Major bug fixes:
         · Fixed 'help command' bug
         · Fixed 'password modify' bug
diff --git a/README.md b/README.md
index 5180562..43520da 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,20 @@
 # Steelbox
-![Steel box](https://static.wikia.nocookie.net/elderscrolls/images/6/6a/Skyrim-strongbox.png)
 ## Because sometimes you just want a password manager
 
-Steelbox is a password manager that uses the curses library for interactive terminals
+Steelbox is a password manager that runs under your terminal, with GnuPG.
 
 
-### **ATTENTION: It is recommended you run steelbox under [st](https://st.suckless.org/) or [alacritty](https://alacritty.org/)**
+## **ATTENTION: It is recommended you run steelbox under [st](https://st.suckless.org/) or [alacritty](https://alacritty.org/)**
 
 ### Installation (and upgrade):
 Just run `install.sh` **WITHOUT SUDO**
 
+### To remove Steelbox:
+Just run `install.sh remove` **WITHOUT SUDO**
+
+### Upgrading
 If you're upgrading Steelbox, don't worry: `install.sh` will do it automatically without messing with your password file
+
 #### Dependencies:
 Clipboard support needs the [pyperclip](https://pypi.org/project/pyperclip/) module. You can install it with [pip](https://pypi.org/project/pip/):
 
diff --git a/install.sh b/install.sh
index 144edb5..9ac97e8 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,22 @@
 #!/usr/bin/env bash
 
+case $1 in 
+    'remove')
+    echo Deleting steelbox.sh
+    sudo rm /opt/steelbox.sh
+    echo Deleting steelbox.py
+    sudo rm /opt/steelbox.py
+    echo Deleting help file
+    sudo rm /opt/sbhelp
+    echo Deleting link
+    sudo rm /usr/bin/steelbox
+    echo "## Your password file has not been deleted"
+    echo "## It can be found in $HOME/.pasfile.csv"
+    echo "## or $HOME/.pasfile.csv.gpg"
+    exit 0
+    ;;
+esac
+
 echo Steelbox install
 
 echo Copying steelbox.sh
diff --git a/steelbox.py b/steelbox.py
index 7df4270..cd61cee 100644
--- a/steelbox.py
+++ b/steelbox.py
@@ -211,15 +211,19 @@ def newFile():
     npWin.addstr(1, 1, "SRVC:")
     npWin.addstr(2, 1, "USER:")
     npWin.addstr(3, 1, "PSWD:")
-    STATUS_MESSAGE = "CTRL+G to enter, MAX 45 CHARS"
-    displayStatus(STATUS_MESSAGE)
     npWin.refresh()
 
     # Takes data
+    STATUS_MESSAGE = "Enter the service name - LEAVE EMPTY TO CANCEL"
+    displayStatus(STATUS_MESSAGE)
     svBox.edit()
     passService = svBox.gather()
+    STATUS_MESSAGE = "Enter the username - LEAVE EMPTY TO CANCEL"
+    displayStatus(STATUS_MESSAGE)
     usBox.edit()
     passUser = usBox.gather()
+    STATUS_MESSAGE = "Enter the password- LEAVE EMPTY FOR RANDOM STRING"
+    displayStatus(STATUS_MESSAGE)
     psBox.edit()
     passPswd = psBox.gather()
     if passService != '' and passUser != '':
@@ -256,7 +260,7 @@ def examine():
     fileWin.addstr(1, 1, "SRVC: " + passService)
     fileWin.addstr(2, 1, "NAME: " + passUser)
     fileWin.addstr(3, 1, "PSWD: " + passPswd)
-    STATUS_MESSAGE = "cmds:(d|DEL)ete,(m)odify, (c)opy "
+    STATUS_MESSAGE = "(d|el),(c)opy,(m)odify"
     displayStatus(STATUS_MESSAGE)
     # Gets command to act on the highlighted file
     c = fileWin.getch()
@@ -414,7 +418,7 @@ def displayItems():
             LINE = 0
             COLUMN+=16
             NROWS+=1
-    STATUS_MESSAGE = "PrvPage(F1),NxtPage(F2),(d|el),(n)ew,(c)opy,(m)odify,(r)andom,(q)uit"
+    STATUS_MESSAGE = "(n)ew,(d|el),(c)opy,(m)odify,(h)elp,(q)uit"
     displayStatus(STATUS_MESSAGE)
     mainwin.refresh()