From 1d0d4ac1d9349a0c478b242022c91424155695c1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 16 May 2023 01:43:25 +0200 Subject: added more scripts --- bin/guiscripts/keyadd | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 bin/guiscripts/keyadd (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd new file mode 100755 index 0000000..87d844d --- /dev/null +++ b/bin/guiscripts/keyadd @@ -0,0 +1,24 @@ +#!/bin/sh +die () +{ + echo "$1" >&2 +} + +key="$(find ~/.ssh -iname "*.pub" | + sed "s,$HOME/.ssh/,," | + cut -f1 -d. | + $MENUCMD)" +die "key: $key" + +HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/') + +if ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" +then + export SSH_ASKPASS="passvar" + export PASSWORD="keys/fl/ssh/$key" + ssh-add - < $HOME/.ssh/$key + notify-send "$0" "added $key" +else + die "key already added." + notify-send "$0" "key already added." +fi -- cgit v1.2.3 From d204513a3eed40976c6212b56bb674cc55811d87 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 16 May 2023 06:34:02 +0200 Subject: don't continue if key does not exist --- bin/guiscripts/keyadd | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 87d844d..3f0baa4 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -10,6 +10,8 @@ key="$(find ~/.ssh -iname "*.pub" | $MENUCMD)" die "key: $key" +test ! -f "$HOME/.ssh/$key" && exit 1 + HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/') if ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" -- cgit v1.2.3 From e1b9863683a9f4ec791ba462175f6d3c17b35da9 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 16 May 2023 06:34:56 +0200 Subject: added delete option --- bin/guiscripts/keyadd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 3f0baa4..5962e07 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -14,7 +14,11 @@ test ! -f "$HOME/.ssh/$key" && exit 1 HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/') -if ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" +if [ "$1" = "-d" ] +then + ssh-add -d - < $HOME/.ssh/$key.pub && + notify-send "$0" "delted $key" +elif ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" then export SSH_ASKPASS="passvar" export PASSWORD="keys/fl/ssh/$key" -- cgit v1.2.3 From 5acfacf76f22948e50aad35557ca67dc54a343df Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 16 May 2023 06:35:03 +0200 Subject: cleanup --- bin/guiscripts/keyadd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 5962e07..53475dc 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -22,8 +22,8 @@ elif ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" then export SSH_ASKPASS="passvar" export PASSWORD="keys/fl/ssh/$key" - ssh-add - < $HOME/.ssh/$key - notify-send "$0" "added $key" + ssh-add - < $HOME/.ssh/$key && + notify-send "$0" "added $key" else die "key already added." notify-send "$0" "key already added." -- cgit v1.2.3 From 8301dab64e215ffc16c1fb7bb7c635f797cbbabb Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 16 May 2023 18:59:15 +0200 Subject: use keyadd instead of passvar --- bin/extra/passvar | 2 -- bin/guiscripts/keyadd | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) delete mode 100755 bin/extra/passvar (limited to 'bin/guiscripts/keyadd') diff --git a/bin/extra/passvar b/bin/extra/passvar deleted file mode 100755 index b309ff4..0000000 --- a/bin/extra/passvar +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -pass show $PASSWORD diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 53475dc..21a3668 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -4,6 +4,14 @@ die () echo "$1" >&2 } +# For when script calls itself +if [ -n "$PASSWORD" ] +then + pass show "$PASSWORD" && + exit + exit 1 +fi + key="$(find ~/.ssh -iname "*.pub" | sed "s,$HOME/.ssh/,," | cut -f1 -d. | @@ -20,8 +28,8 @@ then notify-send "$0" "delted $key" elif ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" then - export SSH_ASKPASS="passvar" export PASSWORD="keys/fl/ssh/$key" + export SSH_ASKPASS="$0" ssh-add - < $HOME/.ssh/$key && notify-send "$0" "added $key" else -- cgit v1.2.3 From 6f7a492a03deb61bf37e3b5b6574c696912144d1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 16 May 2023 18:59:29 +0200 Subject: fixed typo --- bin/guiscripts/keyadd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 21a3668..aac7cdf 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -25,7 +25,7 @@ HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/') if [ "$1" = "-d" ] then ssh-add -d - < $HOME/.ssh/$key.pub && - notify-send "$0" "delted $key" + notify-send "$0" "deleted $key" elif ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" then export PASSWORD="keys/fl/ssh/$key" -- cgit v1.2.3 From ffa80c324e5b26b2cbaf154b5b3f2731bfa55f00 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 17 May 2023 11:17:49 +0200 Subject: added menucmd handling and SSHFOLDER variable --- bin/guiscripts/keyadd | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index aac7cdf..7412199 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -1,8 +1,4 @@ #!/bin/sh -die () -{ - echo "$1" >&2 -} # For when script calls itself if [ -n "$PASSWORD" ] @@ -12,25 +8,42 @@ then exit 1 fi -key="$(find ~/.ssh -iname "*.pub" | - sed "s,$HOME/.ssh/,," | - cut -f1 -d. | - $MENUCMD)" + +if [ "$MENUCMD" = "tofi" ] +then + menucmd="tofi --matching-algorithm=normal" +else + menucmd="$MENUCMD" +fi + + +die () +{ + echo "$1" >&2 +} + +SSHFOLDER="$HOME/.ssh" + +key="$(find "$SSHFOLDER" -iname "*.pub" | + sed "s,$SSHFOLDER/,," | # Clean + sed 's/\.pub$//' | + $menucmd)" die "key: $key" -test ! -f "$HOME/.ssh/$key" && exit 1 +test ! -f "$SSHFOLDER/$key" && exit 1 HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/') if [ "$1" = "-d" ] then - ssh-add -d - < $HOME/.ssh/$key.pub && - notify-send "$0" "deleted $key" -elif ! ssh-add -l | grep -q "$(ssh-keygen -lf $HOME/.ssh/$key)" + ssh-add -d - < "$SSHFOLDER"/$key.pub && + notify-send "$0" "deleted $key" || + notify-send "$0" "could not delete." +elif ! ssh-add -l | grep -q "$(ssh-keygen -lf "$SSHFOLDER"/$key)" then export PASSWORD="keys/fl/ssh/$key" export SSH_ASKPASS="$0" - ssh-add - < $HOME/.ssh/$key && + ssh-add - < "$SSHFOLDER"/$key && notify-send "$0" "added $key" else die "key already added." -- cgit v1.2.3 From 5638d25af55736ded479373401bce51885e29123 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 17 May 2023 11:59:06 +0200 Subject: fixed HOST variable not used --- bin/guiscripts/keyadd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/guiscripts/keyadd') diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 7412199..b5bc4d9 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -33,6 +33,7 @@ die "key: $key" test ! -f "$SSHFOLDER/$key" && exit 1 HOST=$(hostnamectl hostname | sed 's/forlure/fl/;s/montecristo/mc/') +die "HOST: $HOST" if [ "$1" = "-d" ] then @@ -41,7 +42,7 @@ then notify-send "$0" "could not delete." elif ! ssh-add -l | grep -q "$(ssh-keygen -lf "$SSHFOLDER"/$key)" then - export PASSWORD="keys/fl/ssh/$key" + export PASSWORD="keys/$HOST/ssh/$key" export SSH_ASKPASS="$0" ssh-add - < "$SSHFOLDER"/$key && notify-send "$0" "added $key" -- cgit v1.2.3