First GRO stamp, then GPG

start

@@ -69,7 +69,7 @@ function confirm() {
 }
 
 function jhpAskForField() {
-  text="Please choose a free field on the passport.\n
+  text="$1: Please choose a free field on the passport.\n
   ------------------\n 
   | Archievements  |\n
   ==================\n
@@ -93,7 +93,7 @@ function jhpAskForField() {
 }
 
 function jhpPrintGPG() {
-  jhpAskForField
+  jhpAskForField "GPG fingerprint"
   if [ $? -eq 0 ]; then
     diaBox "Insert Passport" "Please insert passport (Archivements) into the printer."
     cd jhp
@@ -114,7 +114,7 @@ function jhpPrintReg() {
 }
 
 function jhpGROStamp() {
-  jhpAskForField
+  jhpAskForField "GRO stamp"
   if [ $? -eq 0 ]; then
     diaBox "Insert Passport" "Please insert passport (Archivements) into the printer."
     cd jhp
@@ -169,6 +169,12 @@ function jhpReg() {
 
   confirm="  Forename:  $FNAME\n  Surename:  $SNAME\n  Planet:    $PLANET"
 
+  ynBox "GRO Stamp" "Does this being wants to have a GRO stamp?"
+  if [ $? -eq 0 ]; then
+    STAMP=true
+  else
+    STAMP=false
+  fi
 
   ynBox "GPG" "Does the being have a GPG key to register?"
   if [ $? -eq 0 ]; then
@@ -187,8 +193,8 @@ function jhpmenu() {
   dialog --backtitle "$BT" \
   --menu "Select ID type:" 14 40 3 \
   1 "Registration" \
-  2 "GPG" \
-  3 "GRO Stamp" \
+  2 "GRO Stamp" \
+  3 "GPG" \
   9 "Back" 2> $TMP
  
   choice=$(cat $TMP)
@@ -197,17 +203,21 @@ function jhpmenu() {
     1)  jhpReg
         if [ $? -eq 0 ]; then
           jhpPrintReg
+          if [ "$STAMP" == "true" ]; then
+            jhpGROStamp
+          fi
           if [ -n "$FP" ]; then
             jhpPrintGPG
           fi
         fi
         ;;
-    2)  jhpGPG
+    2)  jhpGROStamp
+        ;;
+    3)  jhpGPG
         if [ $? -eq 0 ]; then
           jhpPrintGPG
         fi
         ;;
-    3)  jhpGROStamp
         
   esac
   unset FNAME