Browse Source

Show public and private gpg key filenames during install

Bob Mottram 9 years ago
parent
commit
39e2d67984
2 changed files with 8 additions and 2 deletions
  1. 3
    0
      src/freedombone
  2. 5
    2
      src/freedombone-config

+ 3
- 0
src/freedombone View File

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

+ 5
- 2
src/freedombone-config View File

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