storm/fleacollar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GPG configured on startup if not found. MOre gettext stuff fixed.

Browse Source
This commit is contained in:
stormdragon2976@gmail.com 2018-08-08 11:35:50 -04:00
parent 9d99f308e3
commit 30bf977ea7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fleacollar.sh
View File

@ -26,7 +26,8 @@ check_dependancies()
fi
done
if ! [ -d ~/.gnupg ]; then
read -p "$(eval_gettext "No configuration for GPG was found. to have \${0##*/} configure this for you, select Configure GPG from the main menu. Press enter to continue. ")" continue
read -p "$(eval_gettext "No configuration for GPG was found. To have \${0##*/} configure this for you press enter. If you would like to configure GPG manually, press control+c.") " continue
configure_gpg
fi
}
@ -88,8 +89,8 @@ initialize_directory()
echo "set pgp_replyencrypt=yes" >> "$muttHome/gpg.rc"
echo "set pgp_timeout=1800" >> "$muttHome/gpg.rc"
if ! gpg --list-secret-keys | grep '.*@.*' &> /dev/null ; then
read -p "$(gettext "No gpg key was found. Press enter to generate one now, or control+c if you would like to do so manually. Note, the default values are usually what you want.")" continue
gpg --gen-key
read -p "$(gettext "No gpg key was found. Press enter to generate one now, or control+c if you would like to do so manually.") " continue
gpg --quick-gen-key
fi
echo "$(gettext "Select the key you want to use for encryption/signing:")"
select key in $(gpg --list-secret-keys | grep '.*@.*' | cut -d '<' -f2 | cut -d '>' -f1) ; do
@ -233,9 +234,9 @@ add_email_address()
passOne=a
passTwo=b
until [ "$passOne" = "$passTwo" ]; do
read -sp "$(gettext"Please enter the password for $emailAddress: ")" passOne
read -sp "$(gettext "Please enter the password for $emailAddress:") " passOne
echo
read -sp "$(gettext"Please enter the password again: ")" passTwo
read -sp "$(gettext "Please enter the password again: ")" passTwo
echo
if [ "$passOne" != "$passTwo" ]; then
echo "$(gettext "The passwords do not match.")"