[gentoo-commits] gentoo-vdr r642 - in gentoo-vdr-scripts/trunk: . usr/share/vdr/bin

[Matthias Schwarzott (zzam)]

Author: zzam
Date: 2008-07-30 16:05:58 +0000 (Wed, 30 Jul 2008)
New Revision: 642

Modified:
   gentoo-vdr-scripts/trunk/ChangeLog
   gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
Log:
Simplify shutdown code a bit.

Modified: gentoo-vdr-scripts/trunk/ChangeLog
===================================================================
--- gentoo-vdr-scripts/trunk/ChangeLog	2008-07-30 15:46:17 UTC (rev 641)
+++ gentoo-vdr-scripts/trunk/ChangeLog	2008-07-30 16:05:58 UTC (rev 642)
@@ -2,6 +2,10 @@
 # $Id$
 
   30 Jul 2008; Matthias Schwarzott <zzam@g.o>
+  usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh:
+  Simplify shutdown code a bit.
+
+  30 Jul 2008; Matthias Schwarzott <zzam@g.o>
   +usr/share/vdr/bin/vdrshutdown-gate.sh,
   usr/share/vdr/bin/vdrshutdown-really.sh,
   usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh:

Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
===================================================================
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh	2008-07-30 15:46:17 UTC (rev 641)
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh	2008-07-30 16:05:58 UTC (rev 642)
@@ -10,15 +10,15 @@
 # real shutdown/reboot.
 #
 
-. /usr/share/vdr/inc/functions.sh
-include shutdown-functions
-shutdown_script_dir=/usr/share/vdr/shutdown
-
 if [ "$UID" != "0" ]; then
 	echo "This program should be run as root"
 	exit 99
 fi
 
+. /usr/share/vdr/inc/functions.sh
+include shutdown-functions
+shutdown_script_dir=/usr/share/vdr/shutdown
+
 if [ "${DEBUG}" -ge 1 ]; then
 	exec >/tmp/vdrshutdown-real-log 2>&1
 	echo Started debug output of $0 $@
@@ -44,8 +44,7 @@
 	date +%s > ${shutdown_data_dir}/shutdown-need-reboot
 }
 
-read_reboot_setting() {
-	NEED_REBOOT=0
+need_reboot() {
 	[ -e "${shutdown_data_dir}/shutdown-need-reboot" ] || return
 	local TSTAMP=$(cat ${shutdown_data_dir}/shutdown-need-reboot)
 	local NOW=$(date +%s)
@@ -55,8 +54,10 @@
 	UPTIME=${UPTIME%%.*}
 
 	if [ "${REBOOT_SET_AGO}" -lt "${UPTIME}" ]; then
-		NEED_REBOOT=1
+		return 0
 	fi
+
+	return 1
 }
 
 
@@ -83,16 +84,23 @@
 done
 [ ${wakeup_ok} = 0 ] && exit 99
 
+
+SHUTDOWN_METHOD=halt
+if need_reboot; then
+	SHUTDOWN_METHOD=reboot
+fi
+
+f="${shutdown_script_dir}/shutdown-${SHUTDOWN_METHOD}.sh"
+
 if [ "${DRY_SHUTDOWN}" = "1" ]; then
+	echo "dry run: NOT executing shutdown-${SHUTDOWN_METHOD}.sh"
 	exit 0
 fi
 
-read_reboot_setting
+if [ -f "$f" ]; then
+	echo "Executing shutdown-${SHUTDOWN_METHOD}.sh"
+	. "$f"
+fi
 
-case "${NEED_REBOOT}" in
-	1)	. ${shutdown_script_dir}/shutdown-reboot.sh ;;
-	0)	. ${shutdown_script_dir}/shutdown-halt.sh ;;
-esac
-
 exit 0