free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show public and private gpg key filenames during install

This commit is contained in:
Bob Mottram 2015-11-29 13:14:15 +00:00
parent 970e3dfca1
commit 39e2d67984
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedombone
View File

@ -7476,6 +7476,9 @@ function configure_gpg {
chmod 600 /home/$MY_USERNAME/.gnupg/* chmod 600 /home/$MY_USERNAME/.gnupg/*
if [[ $MY_GPG_PUBLIC_KEY && $MY_GPG_PRIVATE_KEY ]]; then if [[ $MY_GPG_PUBLIC_KEY && $MY_GPG_PRIVATE_KEY ]]; then
echo "Public key: $MY_GPG_PUBLIC_KEY"
echo "Private key: $MY_GPG_PRIVATE_KEY"
# use your existing GPG keys which were exported # use your existing GPG keys which were exported
if [ ! -f $MY_GPG_PUBLIC_KEY ]; then if [ ! -f $MY_GPG_PUBLIC_KEY ]; then
echo "GPG public key file $MY_GPG_PUBLIC_KEY was not found" echo "GPG public key file $MY_GPG_PUBLIC_KEY was not found"

7
src/freedombone-config
View File

@ -474,9 +474,12 @@ function interactive_gpg {
255) exit 2;; 255) exit 2;;
esac esac
case $(cat $data) in case $(cat $data) in
1) return;; 1) if [ -d /home/$MY_USERNAME/.gnupg ]; then
rm -rf /home/$MY_USERNAME/.gnupg
fi
break;;
2) interactive_gpg_from_usb 2) interactive_gpg_from_usb
return;; break;;
3) interactive_gpg_from_remote 3) interactive_gpg_from_remote
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
GPG_CONFIGURED="no" GPG_CONFIGURED="no"