From 6738d30a91961fa37f99ab16df4c1f58937748c5 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sun, 13 Aug 2023 02:01:02 +0200
Subject: [mpass] cleanup of messages and commands

---
 bin/guiscripts/keyadd | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd
index e0a1661..cb81efe 100755
--- a/bin/guiscripts/keyadd
+++ b/bin/guiscripts/keyadd
@@ -35,7 +35,7 @@ SSHFOLDER="$HOME/.ssh"
 ssh-add -l > /dev/null 2>&1
 if [ $? -gt 1 ] # ignore if there are no identities
 then
-	notify "could not connect to agent."
+	notify "Could not connect to agent."
 	exit 1
 fi
 
@@ -50,26 +50,26 @@ else
 fi
 die "key: $key"
 
-test ! -f "$SSHFOLDER/$key" && exit 1
+[ ! -f "$SSHFOLDER/$key" ] && exit 1
 
-HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/')
-die "HOST: $HOST"
+HOST=$(hostnamectl hostname)
+die "host: $HOST"
 
 if [ "$1" = "-d" ]
 then
-	if ssh-add -d - < "$SSHFOLDER"/"$key".pub
+	if ssh-add -q -d - < "$SSHFOLDER"/"$key".pub 2> /dev/null
 	then
-		notify "deleted <b>$key</b>"
+		notify "Deleted <b>$key</b>"
 	else
-		notify "could not delete."
+		notify "Could not delete."
 	fi
 # check if key is already added
 elif ssh-add -l | grep -q "$(ssh-keygen -lf "$SSHFOLDER"/"$key")"
 then
-	notify "key already added."
+	notify "Key already added."
 else	
 	export PASSWORD="keys/$HOST/ssh/$key"
 	export SSH_ASKPASS="$0"
-	ssh-add - < "$SSHFOLDER"/"$key" &&
-		notify "added <b>$key</b>"
+	ssh-add -q - < "$SSHFOLDER"/"$key" &&
+		notify "Added <b>$key</b>."
 fi
-- 
cgit v1.2.3