From 38615cf0a2524971be70bc1dc7cc14a0966df093 Mon Sep 17 00:00:00 2001 From: arno Date: Sat, 18 Jul 2020 12:36:43 +0200 Subject: [PATCH] confirmation for reboot and shutdown --- home.admin/00mainMenu.sh | 31 +++++++++++++++++++++++-------- home.admin/XXconfirmation.sh | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) create mode 100755 home.admin/XXconfirmation.sh diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh index caa9e5b9d..fa76091be 100755 --- a/home.admin/00mainMenu.sh +++ b/home.admin/00mainMenu.sh @@ -1,4 +1,5 @@ #!/bin/bash + echo "Starting the main menu ..." # CONFIGFILE - configuration of RaspiBlitz @@ -7,9 +8,13 @@ configFile="/mnt/hdd/raspiblitz.conf" # INFOFILE - state data from bootstrap infoFile="/home/admin/raspiblitz.info" +# CONFIRMATIONFILE - confirmation dialog +confirmationFile="/home/admin/XXconfirmation.sh" + # MAIN MENU AFTER SETUP source ${infoFile} source ${configFile} +source ${confirmationFile} # get the local network IP to be displayed on the lCD localip=$(ip addr | grep 'state UP' -A2 | egrep -v 'docker0' | grep 'eth0\|wlan0' | tail -n1 | awk '{print $2}' | cut -f1 -d'/') @@ -279,16 +284,26 @@ case $CHOICE in /home/admin/99updateMenu.sh ;; REBOOT) - clear - echo "" - sudo /home/admin/XXshutdown.sh reboot - exit 0 + clear + confirmation "Reboot" true 9 40 + confirmationReboot=$? + if [ $confirmationReboot -eq 0 ]; then + clear + echo "" + sudo /home/admin/XXshutdown.sh reboot + exit 0 + fi ;; OFF) - clear - echo "" - sudo /home/admin/XXshutdown.sh - exit 0 + clear + confirmation "PowerOff" true 9 40 + confirmationShutdown=$? + if [ $confirmationShutdown -eq 0 ]; then + clear + echo "" + sudo /home/admin/XXshutdown.sh + exit 0 + fi ;; DELETE) sudo /home/admin/XXcleanHDD.sh diff --git a/home.admin/XXconfirmation.sh b/home.admin/XXconfirmation.sh new file mode 100755 index 000000000..3f91b8a14 --- /dev/null +++ b/home.admin/XXconfirmation.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +confirmation() +{ + text=$1 + defaultno=$2 + height=$3 + width=$4 + + if [ $defaultno ]; then + whiptail --title " Confirmation " --defaultno --yes-button "Yes" --no-button "No" --yesno " $1 + + Are you sure? + " $height $width + else + whiptail --title " Confirmation " --yes-button "Yes" --no-button "No" --yesno " $1 + + Are you sure? + " $height $width + fi + return $? +}