From 333d5c9e3c429ed2e78902bbbbb7b393dfa0f92f Mon Sep 17 00:00:00 2001
From: Bandie <bandie@chaospott.de>
Date: Mon, 4 Jan 2021 22:04:43 +0100
Subject: [PATCH] Fix: GPG-Search

---
 start        | 15 ++++++++++-----
 start_dialog | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/start b/start
index d999385..19602be 100755
--- a/start
+++ b/start
@@ -99,18 +99,21 @@ function gpgSearch() {
       echo "Searching for GPG key..."
       gpg --keyserver "hkps://keys.openpgp.org" --search "$(cat $TMP)"
       if [ $? -eq 0 ]; then
-        export FFP=$(gpg -k "$(cat $TMP)" | head -n 2 | tail -n 1 | awk '{print $1}' | sed 's/.\{4\}/& /g;s/^\(.*\) $/\1/g')
+        FFP=$(gpg -k "$(cat $TMP)" | head -n 2 | tail -n 1 | awk '{print $1}' | sed 's/.\{4\}/& /g;s/^\(.*\) $/\1/g')
         gpg --batch --delete-key "$FFP"
         if [ "$FFP" = "" ]; then
-          gpgSearch
+          diaBox "GPG Search" "No fingerprint has been found for $(cat $TMP)"
+          return 1
         else
           return 0
         fi
       else
-        gpgSearch
+        diaBox "GPG Search" "No fingerprint has been found for $(cat $TMP)"
+        return 1
       fi
     else
-      gpgSearch
+      diaBox "GPG Search" "This is on vaild mail address."
+      return 1
     fi
   fi
   return 1
@@ -137,8 +140,10 @@ function enterGPG() {
       gpgSearch
       if [ $? -eq 0 ]; then
         enterGPG "$FFP" "no-confirm"
+        return 0
+      else
+        return 1
       fi
-      return
       ;;
   esac
 
diff --git a/start_dialog b/start_dialog
index bf66b27..17368b5 100755
--- a/start_dialog
+++ b/start_dialog
@@ -133,18 +133,21 @@ function gpgSearch() {
       echo "Searching for GPG key..."
       gpg --keyserver "hkps://keys.openpgp.org" --search "$(cat $TMP)"
       if [ $? -eq 0 ]; then
-        export FFP=$(gpg -k "$(cat $TMP)" | head -n 2 | tail -n 1 | awk '{print $1}' | sed 's/.\{4\}/& /g;s/^\(.*\) $/\1/g')
+        FFP=$(gpg -k "$(cat $TMP)" | head -n 2 | tail -n 1 | awk '{print $1}' | sed 's/.\{4\}/& /g;s/^\(.*\) $/\1/g')
         gpg --batch --delete-key "$FFP"
         if [ "$FFP" = "" ]; then
-          gpgSearch
+          diaBox "GPG Search" "No fingerprint has been found for $(cat $TMP)"
+          return 1
         else
           return 0
         fi
       else
-        gpgSearch
+        diaBox "GPG Search" "No fingerprint has been found for $(cat $TMP)"
+        return 1
       fi
     else
-      gpgSearch
+      diaBox "GPG Search" "This is on vaild mail address."
+      return 1
     fi
   fi
   return 1
@@ -171,8 +174,10 @@ function enterGPG() {
       gpgSearch
       if [ $? -eq 0 ]; then
         enterGPG "$FFP" "no-confirm"
+        return 0
+      else
+        return 1
       fi
-      return
       ;;
   esac