From 8009661cee4f81afa1e08034699c94cd4b5ded4c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 12 Dec 2016 15:39:15 +0000
Subject: [PATCH] Skip the end message dialog and go straight to reboot

---
 src/freedombone                 | 2 ++
 src/freedombone-image-customise | 7 -------
 src/freedombone-utils-final     | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index b886ed88..f533ea11 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -340,5 +340,7 @@ setup_web
 setup_apps $command_options
 setup_final
 
+echo ''
 echo "${PROJECT_NAME} installation is complete"
+
 exit 0
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index df361ff7..6cf3af5d 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -395,18 +395,12 @@ EOF
     echo '            rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
     echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
-    END_MESSAGE1=$'Congratulations!'
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
-        END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at:\n\n  ${SSH_ONION_HOSTNAME}\n\nTo copy the above address hold down the shift key and double left click on it, then right click and select "copy".\n\nPress any key to reboot and begin using the system'
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
 
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
         echo '                exit 62392' >> $rootdir/root/.bashrc
         echo '            fi' >> $rootdir/root/.bashrc
-        END_MESSAGE_HEIGHT=16
-    else
-        END_MESSAGE2=$'\nYour system has now installed\n\nPress any key to reboot and begin using it'
-        END_MESSAGE_HEIGHT=12
     fi
     echo "            if [ -f /root/${PROJECT_NAME}-wifi.cfg ]; then" >> $rootdir/root/.bashrc
     echo "                echo '[Unit]' > /etc/systemd/system/wifistart.service" >> $rootdir/root/.bashrc
@@ -427,7 +421,6 @@ EOF
     echo "                systemctl enable wifistart" >> $rootdir/root/.bashrc
     echo "                systemctl daemon-reload" >> $rootdir/root/.bashrc
     echo '            fi' >> $rootdir/root/.bashrc
-    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" ${END_MESSAGE_HEIGHT} 60" >> $rootdir/root/.bashrc
     echo '            reboot' >> $rootdir/root/.bashrc
     echo '        fi' >> $rootdir/root/.bashrc
     echo '    else' >> $rootdir/root/.bashrc
diff --git a/src/freedombone-utils-final b/src/freedombone-utils-final
index 1fffbf17..6f3d9a35 100755
--- a/src/freedombone-utils-final
+++ b/src/freedombone-utils-final
@@ -46,8 +46,6 @@ function install_final {
     echo ''
 
     echo $"
-*** ${PROJECT_NAME} installation is complete ***
-
 If you wish to verify the server ssh public key at next login it is:
 $(get_ssh_server_key)