[people/teissler/ipfire-2.x.git] / src / patches / w_scan-ipfire.patch

diff -Naur w_scan_start.sh w_scan_start.sh
--- w_scan_start.sh	2008-01-05 19:58:44.000000000 +0100
+++ w_scan_start.sh	2008-05-14 18:29:21.000000000 +0200
@@ -6,11 +6,11 @@
 # - 20060812: first version
 # - 20060822: many improvements
 # cu@vdr-portal
-#
+# - 20080514: patches for ipfire by arne_f@ipfire.org
 #######################################################
 
 umask 022
-export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
+export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin:/opt/vdr/bin"
 DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
 W_SCAN=$(which w_scan 2>/dev/null)
 UDEVSTART=$(which udevstart)
@@ -224,7 +224,7 @@
 		echo "Checking for ct-vdr style startscript.."
 		if [ -e /etc/init.d/vdr ]; then			# c't-vdr
 			echo_yes
-			$(/etc/init.d/vdr stop)
+			/etc/init.d/vdr stop
 			stopped=true
 		else
 			echo_no
@@ -375,7 +375,7 @@
 
 	# which generic dvb modules should be always loaded?
 	MODULES_TO_LOAD="videodev v4l1_compat \
-			v4l2_common video_buf dvb_core ves1820 \
+			v4l2_common dvb_core ves1820 \
 			dvb_ttpci \
 			budget_ci budget_av budget_ci budget "
 
@@ -661,9 +661,11 @@
 	echo -e -n $NORMAL
 	echo -e -n "\\033[1;34m"
 	if [ ${WHAT_TO_SCAN:0:2} != 0 ]; then
+		echo ":->W_SCAN $DATE DVB-T" >> channels.conf-$DATE
 		$W_SCAN >> channels.conf-$DATE
 	fi
-	if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then 
+	if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
+		echo ":->W_SCAN $DATE DVB-C" >> channels.conf-$DATE 
 		$W_SCAN -fc >> channels.conf-$DATE
 	fi 
 	echo -e -n $NORMAL
@@ -671,55 +673,34 @@
 
 function CopyConf ()
 {
-	if [ -s channels.conf-$DATE ]; then
-		clear
-		echo -e -n $SUCCESS
-		echo "****************************************************************"
-		echo "*                                                              *"
-		echo "* w_scan is done.                                              *"
-		echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS".            *"
-		echo "* Should I copy this to default location for you? [y/n]        *"
-		echo "*                                                              *"
-		echo "****************************************************************"
-		echo -e -n $NORMAL && tput sgr0
-		read RESPONSE
-		echo -e -n $NORMAL
-		if [ "$RESPONSE" != "y" ]; then
-			echo "Copying channels.conf skipped - okay."
-			echo "The channels.conf generated can be found at"
-			echo -n -e "\\033[1;34m"
-			echo "$(pwd)/channels.conf-$DATE"
-			echo ""
-			echo -e -n $NORMAL
-		else
-			if [ -d /etc/vdr ]; then
-				mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE
-				cp channels.conf-$DATE /etc/vdr/channels.conf
-			fi
-			if [ -d /var/lib/vdr ]; then
-				mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
-				cp channels.conf-$DATE /var/lib/vdr/channels.conf
-			fi			
-		fi
-        else
-		clear
-		echo -e -n $FAILURE
-		echo "****************************************************************"
-		echo "*                                                              *"
-		echo "* Something went wrong. The channels.conf generated is *EMPTY*!*"
-		echo "* To analyze your problem I recommend the command              *"
-		echo "*    './w_scan 2>&1 | tee w_scan.log-dvbt &&                   *"
-		echo "*     ./w_scan -fc 2>&1 | tee w_scan.log-dvbc'                 *"
-		echo "*                                                              *"
-		echo "* w_scan will report the problem into the logfiles             *"
-		echo "* w_scan.log-dvbt and w_scan.log-dvbc.                         *"
-		echo "*                                                              *"
-		echo "* PRESS ANY KEY TO CONTINUE                                    *"
-		echo "****************************************************************"
+	echo -e -n $SUCCESS
+	echo "****************************************************************"
+	echo "*                                                              *"
+	echo "* w_scan is done.                                              *"
+	echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS".            *"
+	echo "* Should I copy this to default location for you? [y/n]        *"
+	echo "*                                                              *"
+	echo "****************************************************************"
+	echo -e -n $NORMAL && tput sgr0
+	read RESPONSE
+	echo -e -n $NORMAL
+	if [ "$RESPONSE" != "y" ]; then
+		echo "Copying channels.conf skipped - okay."
+		echo "The channels.conf generated can be found at"
+		echo -n -e "\\033[1;34m"
+		echo "$(pwd)/channels.conf-$DATE"
+		echo ""
 		echo -e -n $NORMAL
-		read
+	else
+		if [ -d /opt/vdr/etc ]; then
+			mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE
+			cp channels.conf-$DATE /opt/vdr/etc/channels.conf
+		fi
+		if [ -d /var/lib/vdr ]; then
+			mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
+			cp channels.conf-$DATE /var/lib/vdr/channels.conf
+		fi			
 	fi
-
 }
 
 # the program itself.
Commit	Line	Data
e3872fbd	1	diff -Naur w_scan_start.sh w_scan_start.sh
2adf5286	2	--- w_scan_start.sh 2008-01-05 19:58:44.000000000 +0100
e3872fbd AF	3	+++ w_scan_start.sh 2008-05-14 18:29:21.000000000 +0200
	4	@@ -6,11 +6,11 @@
	5	# - 20060812: first version
	6	# - 20060822: many improvements
	7	# cu@vdr-portal
	8	-#
	9	+# - 20080514: patches for ipfire by arne_f@ipfire.org
2adf5286 AF	10	#######################################################
	11
	12	umask 022
	13	-export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
	14	+export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin:/opt/vdr/bin"
	15	DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
	16	W_SCAN=$(which w_scan 2>/dev/null)
	17	UDEVSTART=$(which udevstart)
75d098ef AF	18	@@ -224,7 +224,7 @@
	19	echo "Checking for ct-vdr style startscript.."
	20	if [ -e /etc/init.d/vdr ]; then # c't-vdr
	21	echo_yes
	22	- $(/etc/init.d/vdr stop)
	23	+ /etc/init.d/vdr stop
	24	stopped=true
	25	else
	26	echo_no
e3872fbd AF	27	@@ -375,7 +375,7 @@
	28
	29	# which generic dvb modules should be always loaded?
	30	MODULES_TO_LOAD="videodev v4l1_compat \
	31	- v4l2_common video_buf dvb_core ves1820 \
	32	+ v4l2_common dvb_core ves1820 \
	33	dvb_ttpci \
	34	budget_ci budget_av budget_ci budget "
	35
	36	@@ -661,9 +661,11 @@
	37	echo -e -n $NORMAL
	38	echo -e -n "\\033[1;34m"
	39	if [ ${WHAT_TO_SCAN:0:2} != 0 ]; then
	40	+ echo ":->W_SCAN $DATE DVB-T" >> channels.conf-$DATE
	41	$W_SCAN >> channels.conf-$DATE
	42	fi
	43	- if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
	44	+ if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
	45	+ echo ":->W_SCAN $DATE DVB-C" >> channels.conf-$DATE
	46	$W_SCAN -fc >> channels.conf-$DATE
	47	fi
	48	echo -e -n $NORMAL
	49	@@ -671,55 +673,34 @@
	50
	51	function CopyConf ()
	52	{
	53	- if [ -s channels.conf-$DATE ]; then
	54	- clear
	55	- echo -e -n $SUCCESS
	56	- echo "****************************************************************"
	57	- echo "* *"
	58	- echo "* w_scan is done. *"
	59	- echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *"
	60	- echo "* Should I copy this to default location for you? [y/n] *"
	61	- echo "* *"
	62	- echo "****************************************************************"
	63	- echo -e -n $NORMAL && tput sgr0
	64	- read RESPONSE
	65	- echo -e -n $NORMAL
	66	- if [ "$RESPONSE" != "y" ]; then
	67	- echo "Copying channels.conf skipped - okay."
	68	- echo "The channels.conf generated can be found at"
	69	- echo -n -e "\\033[1;34m"
	70	- echo "$(pwd)/channels.conf-$DATE"
	71	- echo ""
	72	- echo -e -n $NORMAL
	73	- else
75d098ef AF	74	- if [ -d /etc/vdr ]; then
	75	- mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE
	76	- cp channels.conf-$DATE /etc/vdr/channels.conf
e3872fbd AF	77	- fi
	78	- if [ -d /var/lib/vdr ]; then
	79	- mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
	80	- cp channels.conf-$DATE /var/lib/vdr/channels.conf
	81	- fi
	82	- fi
	83	- else
	84	- clear
	85	- echo -e -n $FAILURE
	86	- echo "****************************************************************"
	87	- echo "* *"
	88	- echo "* Something went wrong. The channels.conf generated is EMPTY!*"
	89	- echo "* To analyze your problem I recommend the command *"
	90	- echo "* './w_scan 2>&1 \| tee w_scan.log-dvbt && *"
	91	- echo "* ./w_scan -fc 2>&1 \| tee w_scan.log-dvbc' *"
	92	- echo "* *"
	93	- echo "* w_scan will report the problem into the logfiles *"
	94	- echo "* w_scan.log-dvbt and w_scan.log-dvbc. *"
	95	- echo "* *"
	96	- echo "* PRESS ANY KEY TO CONTINUE *"
	97	- echo "****************************************************************"
	98	+ echo -e -n $SUCCESS
	99	+ echo "****************************************************************"
	100	+ echo "* *"
	101	+ echo "* w_scan is done. *"
	102	+ echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *"
	103	+ echo "* Should I copy this to default location for you? [y/n] *"
	104	+ echo "* *"
	105	+ echo "****************************************************************"
	106	+ echo -e -n $NORMAL && tput sgr0
	107	+ read RESPONSE
	108	+ echo -e -n $NORMAL
	109	+ if [ "$RESPONSE" != "y" ]; then
	110	+ echo "Copying channels.conf skipped - okay."
	111	+ echo "The channels.conf generated can be found at"
	112	+ echo -n -e "\\033[1;34m"
	113	+ echo "$(pwd)/channels.conf-$DATE"
	114	+ echo ""
	115	echo -e -n $NORMAL
	116	- read
	117	+ else
	118	+ if [ -d /opt/vdr/etc ]; then
	119	+ mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE
	120	+ cp channels.conf-$DATE /opt/vdr/etc/channels.conf
	121	+ fi
	122	+ if [ -d /var/lib/vdr ]; then
	123	+ mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
	124	+ cp channels.conf-$DATE /var/lib/vdr/channels.conf
	125	+ fi
	126	fi
	127	-
	128	}
	129
	130	# the program itself.