etc/profile.d/gpg.sh

diff --git a/etc/profile.d/gpg.sh b/etc/profile.d/gpg.sh
index 20d34b773fc68476621cdbcc2843e959fc1f831b..e20ba0e5e7dd3c0925d9922c46a86fa3e53b358f 100644 (file)
--- a/etc/profile.d/gpg.sh
+++ b/etc/profile.d/gpg.sh
@@ -10,20 +10,26 @@ gpg_import_ssh() {
 }
 
 gpg_change_password() {
-       echo "Enter old password:"
+       #echo "Enter old password:"
+       key=${1}
+       [ -z "$key" -a -r ~/.gnupg/gpg.conf ] && key="$(awk '$1 == "default-key" {print $2;exit}' ~/.gnupg/gpg.conf)"
+       [ -z "$key" ] && echo "Key missing !" && return 1
+       echo "Changing password for $key"
        read -s -p "Enter old password:" old 
+       echo
        read -s -p "Enter new password:" new
+       echo
        read -s -p "Enter new password again:" new2
+       echo
        if [ "$new" != "$new2" ]
        then
                echo New password differs
                return 1
        fi
-       return
-       gpg --batch --passphrase-fd 0 --pinentry-mode loopback --change-passphrase KEY_ID <<EOF
+       gpg --batch --passphrase-fd 0 --pinentry-mode loopback --change-passphrase "$key" <<EOF
 $old
 $new
-$new
+$new2
 EOF
 }