whiptail size adjustments. fix menus that couldn't be cancelled out of. add path for source so setup can be called from anywhere

setup/functions.sh

@@ -15,6 +15,9 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+SCRIPTDIR=$(dirname "$0")
+source $SCRIPTDIR/whiptail.sh
+
 accept_salt_key_local() {
   echo "Accept the key locally on the master" >> $SETUPLOG 2>&1
   # Accept the key locally on the master
@@ -45,6 +48,9 @@ add_master_hostfile() {
   MSRVIP=$(whiptail --title "Security Onion Setup" --inputbox \
   "Enter your Master Server IP Address" 10 60 X.X.X.X 3>&1 1>&2 2>&3)
 
+  local exitstatus=$?
+  whiptail_check_exitstatus $exitstatus
+
 }
 
 add_socore_user_master() {
@@ -357,6 +363,8 @@ detect_os() {
     exit
   fi
 
+  echo "Found OS: $OS $OSVER" >> $SETUPLOG 2>&1
+
 }
 
 #disable_dnsmasq() {
@@ -520,6 +528,8 @@ got_root() {
 
 install_cleanup() {
 
+  echo "install_cleanup called" >> $SETUPLOG 2>&1
+
   # Clean up after ourselves
   rm -rf /root/installtmp