[gentoo-commits] gentoo-vdr r605 - in gentoo-vdr-scripts/trunk: . etc/init.d usr/share/vdr/inc

[Matthias Schwarzott (zzam)]

Author: zzam
Date: 2008-05-29 16:21:40 +0000 (Thu, 29 May 2008)
New Revision: 605

Removed:
   gentoo-vdr-scripts/trunk/usr/share/vdr/inc/message-functions.sh
Modified:
   gentoo-vdr-scripts/trunk/ChangeLog
   gentoo-vdr-scripts/trunk/etc/init.d/vdr
   gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh
Log:
Absorbed message-functions into init-script.

Modified: gentoo-vdr-scripts/trunk/ChangeLog
===================================================================
--- gentoo-vdr-scripts/trunk/ChangeLog	2008-05-29 16:06:57 UTC (rev 604)
+++ gentoo-vdr-scripts/trunk/ChangeLog	2008-05-29 16:21:40 UTC (rev 605)
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo-vdr-scripts
 # $Id$
 
+  29 May 2008; Matthias Schwarzott <zzam@g.o> etc/init.d/vdr,
+  -usr/share/vdr/inc/message-functions.sh,
+  usr/share/vdr/inc/rc-functions.sh:
+  Absorbed message-functions into init-script.
+
   29 May 2008; Matthias Schwarzott <zzam@g.o>
   -usr/sbin/vdr-inform-watchdog.sh, usr/sbin/vdr-watchdogd:
   Rewrite of vdr-watchdog.

Modified: gentoo-vdr-scripts/trunk/etc/init.d/vdr
===================================================================
--- gentoo-vdr-scripts/trunk/etc/init.d/vdr	2008-05-29 16:06:57 UTC (rev 604)
+++ gentoo-vdr-scripts/trunk/etc/init.d/vdr	2008-05-29 16:21:40 UTC (rev 605)
@@ -10,6 +10,16 @@
 	include rc-functions
 }
 
+#
+# Used to log error-messages in startscript to show them on
+# OSD later when choosing apropriate point in commands.
+#
+
+vdr_log()
+{
+	echo "$@" >> ${VDR_LOG_FILE}
+}
+
 depend() {
 	need net
 	[ "${IR_CTRL}" = "lirc" ] && need lircd
@@ -23,8 +33,11 @@
 	load_functions
 	local exitcode
 
-	init_vdr_start_log
+	VDR_LOG_FILE=/var/vdr/tmp/vdr-start-log
+	rm -f "${VDR_LOG_FILE}"
+	> "${VDR_LOG_FILE}"
 
+
 	einfo "Preparing start of vdr:"
 	init_params
 	init_daemonctrl_params
@@ -83,6 +96,12 @@
 			exitcode=1
 		fi
 	fi
+
+	# wenn nachrichten vorhanden sind
+	if [ -s "${VDR_LOG_FILE}" ]; then
+		/usr/share/vdr/bin/vdr-bg.sh svdrpsend.pl mesg "Errors: Go to Commands/View VDR Start Log"
+	fi
+
 	finish_vdr_start_log
 	return $exitcode
 }

Deleted: gentoo-vdr-scripts/trunk/usr/share/vdr/inc/message-functions.sh
===================================================================
--- gentoo-vdr-scripts/trunk/usr/share/vdr/inc/message-functions.sh	2008-05-29 16:06:57 UTC (rev 604)
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/inc/message-functions.sh	2008-05-29 16:21:40 UTC (rev 605)
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Used to log error-messages in startscript to show them on
-# OSD later when choosing apropriate point in commands.
-#
-
-VDR_LOG_FILE=/var/vdr/tmp/vdr-start-log
-
-init_vdr_start_log()
-{
-	rm -f "${VDR_LOG_FILE}"
-	> "${VDR_LOG_FILE}"
-}
-
-finish_vdr_start_log()
-{
-	# wenn nachrichten vorhanden sind
-	if [ -s "${VDR_LOG_FILE}" ]; then
-		/usr/share/vdr/bin/vdr-bg.sh svdrpsend.pl mesg "Errors: Go to Commands/View VDR Start Log"
-	fi
-}
-
-vdr_log()
-{
-	echo "$@" >> ${VDR_LOG_FILE}
-}
-

Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh
===================================================================
--- gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh	2008-05-29 16:06:57 UTC (rev 604)
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh	2008-05-29 16:21:40 UTC (rev 605)
@@ -7,8 +7,6 @@
 #   Starting and stopping of external watchdog
 #
 
-include message-functions
-
 : ${vdr_rc_dir:=/usr/share/vdr/rcscript}
 : ${vdr_old_rc_dir:=/usr/lib/vdr/rcscript}
 : ${SCRIPT_DEBUG_LEVEL:=0}

-- 
gentoo-commits@l.g.o mailing list