2010-03-13: 3.6.6v3.6.6

- Added: Support new epgsearch v0.9.25-git settings "unmute" and "min. description match".
- Changed: Log to syslog by default (if logging is enabled) (Ville Skyttä).
- Changed: Fall back to stderr if setting up syslog fails (Ville Skyttä).
- Changed: Get character encoding from configured locale or environment variables (Submitted by Tobias Grimm).
- Fixed: Encode SVDRP commands sent to VDR if needed (Submitted by Tobias Grimm).
- Updated: Italian translation (Submitted by Diego Pierotto).
- Updated: Dutch translation (Submitted by Roel Koelewijn).
- Updated: Spanish translation (Submitted by Manuel Gomez).
- Improved: Default mail settings (Ville Skyttä).
- Fixed: Check if "GUI_POPUP_WIDTH" and "GUI_POPUP_HEIGHT" are numeric and set them to the defaults if they are not (Reported by Jan).
- Added: Support VDR 1.7.12+ commands.conf and reccmds.conf (means: skip lines ending in "{" and lines with only "}" in them).
- Added: check file and directory permissions on startup abort on error.
- Changed: Default directory for PID file to /var/run/vdradmin.
- Changed: Default directory for log file to /var/log/vdradmin.
- Changed: Use "cache" directory in the current directory if $SEARCH_FILES_IN_SYSTEM is not set.
- Changed: Hide "record" button in EPG lists there's already a timer for that broadcast (Based on patch by Dave Pickles).
- Added: New options to show or hide a broadcast's subtitle and/or summary in EPG lists (Based on patch by Dave Pickles).
- Added: New option to set a day's "start time" in "Playing today?" (Based on patch by Dave Pickles).
- Changed: Minimum required epgsearch version now is 0.9.24.
- Added: Support for new epgsearch search timer actions (Bug #557).
- Changed: "--ipv6" only enables IPv6 for connections to VDRAdmin-AM, to also use IPv6 for SVDRP connection one can use "--ipv6-all" (if he really knows what he's doing!).
- Fixed: Check encoding for every SVDRP connection (Submitted by Tobias Grimm).
- Changed: Warn about missing key or certificate if --ssl is used.
- Changed: Certificates for --ssl option must be located in $ETCDIR/certs.
- Fixed: Resizing browser window in "Timeline" showed "file not found" (Reported by tag @vdr-portal.de).
- Updated: Links to EPGSearch and Streamdev home pages (Ville Skyttä).
- Updated: Finnish translation (Ville Skyttä).

1 files changed, 48 insertions, 40 deletions

diff --git a/install.sh b/install.sh
index 7d8d663..43f06fd 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2005/6 Andreas Mair
+# vim:noet:sw=4:ts=4:
+# Copyright (c) 2005-2010 Andreas Mair
 #
 #
 # Download and patchscript for VDRAdmin-AM
@@ -12,10 +13,10 @@ ETCDIR=${ETCDIR:-$DESTDIR/etc/vdradmin}
 DOCDIR=${DOCDIR:-$DESTDIR/usr/share/doc/vdradmin}
 BINDIR=${BINDIR:-$DESTDIR/usr/bin}
 LOCDIR=${LOCDIR:-$DESTDIR/usr/share/locale}
-MANDIR=${MANDIR:-$DESTDIR/usr/share/man/man1}
-LOGDIR=${LOGDIR:-$DESTDIR/var/log}
+MANDIR=${MANDIR:-$DESTDIR/usr/share/man}
+LOGDIR=${LOGDIR:-$DESTDIR/var/log/vdradmin}
 CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin}
-PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid}
+PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmin/vdradmind.pid}
 VIDEODIR=${VIDEODIR:-/video}
 EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages}
 VDRCONF=${VDRCONF:-$VIDEODIR}
@@ -69,7 +70,6 @@ function checkPerlModule()
 	else
 		echo " found"
 	fi
-
 }
 
 function perlModules()
@@ -147,9 +147,9 @@ function doInstall()
 	perlModules
 
 	makeDir $LIBDIR 1 && cp -r template lib $LIBDIR || exit 1
-  makeDir $DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL LGPL.txt README* REQUIREMENTS FAQ $DOCDIR || exit 1
-	makeDir $MANDIR && cp vdradmind.pl.1 $MANDIR/vdradmind.1 || exit 1
-	makeDir $ETCDIR || exit 1
+	makeDir $BINDIR || exit 1
+	makeDir $DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL LGPL.txt README* REQUIREMENTS FAQ $DOCDIR || exit 1
+	makeDir $MANDIR/man8 && cp vdradmind.pl.1 $MANDIR/man8/vdradmind.8 || exit 1
 
 	(
 		cd locale
@@ -160,47 +160,48 @@ function doInstall()
 	)
 
 	local RESTART=
-	[ ! -e $BINDIR ] && mkdir -p $BINDIR
 	if [ -d $BINDIR ]; then
 		killRunningVDRAdmin
 		if [ $? -ne 0 ] ; then
 			RESTART=1
-  		echo "Killed running VDRAdmin-AM..."
-  	fi
-  	sed <vdradmind.pl >$BINDIR/vdradmind \
-  	    -e "s/^\(my \$SEARCH_FILES_IN_SYSTEM *=\) 0;/\1 1;/" \
-  	    -e "s:/usr/share/vdradmin/lib:${LIBDIR}/lib:" \
-  	    -e "s:/usr/share/vdradmin/template:${LIBDIR}/template:" \
-  	    -e "s:/var/log:${LOGDIR}:" \
-  	    -e "s:/var/cache/vdradmin:${CACHEDIR}:" \
-  	    -e "s:/var/run/vdradmind.pid:${PIDFILE}:" \
-  	    -e "s:\(\$ETCDIR *= \)\"/etc/vdradmin\";:\1\"${ETCDIR}\";:" \
-  	    -e "s:/usr/share/locale:${LOCDIR}:" \
-  	    -e "s:\(\$CONFIG{VIDEODIR} *= \)\"/video\";:\1\"${VIDEODIR}\";:" \
-  	    -e "s:\(\$CONFIG{EPGIMAGES} *= \)\"\$CONFIG{VIDEODIR}/epgimages\";:\1\"${EPGIMAGES}\";:" \
+			echo "Killed running VDRAdmin-AM..."
+		fi
+		sed <vdradmind.pl >$BINDIR/vdradmind \
+		    -e "s/^\(my \$SEARCH_FILES_IN_SYSTEM *=\) 0;/\1 1;/" \
+		    -e "s:/usr/share/vdradmin/lib:${LIBDIR}/lib:" \
+		    -e "s:/usr/share/vdradmin/template:${LIBDIR}/template:" \
+		   -e "s:/var/log/vdradmin:${LOGDIR}:" \
+		    -e "s:/var/cache/vdradmin:${CACHEDIR}:" \
+		    -e "s:/var/run/vdradmin/vdradmind.pid:${PIDFILE}:" \
+		    -e "s:\(\$ETCDIR *= \)\"/etc/vdradmin\";:\1\"${ETCDIR}\";:" \
+		    -e "s:/usr/share/locale:${LOCDIR}:" \
+		    -e "s:\(\$CONFIG{VIDEODIR} *= \)\"/video\";:\1\"${VIDEODIR}\";:" \
+		    -e "s:\(\$CONFIG{EPGIMAGES} *= \)\"\$CONFIG{VIDEODIR}/epgimages\";:\1\"${EPGIMAGES}\";:" \
 				-e "s:\(\$CONFIG{VDRCONFDIR} *= \)\"\$CONFIG{VIDEODIR}\";:\1\"${VDRCONF}\";:"
 
 		chmod a+x  $BINDIR/vdradmind
 
-  	if [ "$CONFIG" ]; then
-    	echo "Configuring VDRAdmin-AM..."
-    	$BINDIR/vdradmind -c
-  	fi
+		if [ "$CONFIG" ]; then
+			echo "Configuring VDRAdmin-AM..."
+			$BINDIR/vdradmind -c
+		fi
 
-  	if [ "$RESTART" ]; then
-  		echo "Restarting VDRAdmin-AM..."
-  		$BINDIR/vdradmind
-  	fi
+		if [ "$RESTART" ]; then
+			echo "Restarting VDRAdmin-AM..."
+			$BINDIR/vdradmind
+		fi
 
 		echo ""
 		if [ -e $BINDIR/vdradmind.pl ]; then
 			echo "Removing ancient $BINDIR/vdradmind.pl"
 			rm -f $BINDIR/vdradmind.pl
 		fi
-		if [ -e $MANDIR/vdradmind.pl.1 ]; then
-			echo "Removing ancient $MANDIR/vdradmind.pl.1"
-			rm -f $MANDIR/vdradmind.pl.1
-		fi
+		for man in man1/vdradmind.pl.1 man1/vdradmind.1; do
+			if [ -e $MANDIR/$man ]; then
+				echo "Removing ancient $MANDIR/$man"
+				rm -f $MANDIR/$man
+			fi
+		done
 	else
 		echo "$BINDIR exists but is no directory!"
 		echo "Aborting..."
@@ -220,6 +221,14 @@ function doInstall()
 	echo ""
 	echo "NOTE2:"
 	echo "If you would like VDRAdmin-AM to start at system's boot, please modify your system's init scripts."
+
+	local USED_DIRS="$(echo -e "$ETCDIR\n$LOGDIR\n$CACHEDIR\n$(dirname "$PIDFILE")" | sort -u)"
+	echo
+	echo "NOTE3:"
+	echo "VDRAdmin-AM needs to access some directories:"
+	echo "$USED_DIRS"
+	echo
+	echo "Please check that the user VDRAdmin-AM runs has enough permissions to access them!"
 	exit 0
 }
 
@@ -239,12 +248,11 @@ function doUninstall()
 	if [ -d $CACHEDIR ]; then
 		rm -rf $CACHEDIR
 	fi
-	if [ -e $MANDIR/vdradmind.pl.1 ]; then
-		rm -f $MANDIR/vdradmind.pl.1
-	fi
-	if [ -e $MANDIR/vdradmind.1 ]; then
-		rm -f $MANDIR/vdradmind.1
-	fi
+	for man in man1/vdradmind.pl.1 man1/vdradmind.1 man8/vdradmind.8; do
+		if [ -e $MANDIR/$man ]; then
+			rm -f $MANDIR/$man
+		fi
+	done
 	if [ -e $BINDIR/vdradmind.pl ]; then
 		rm -f $BINDIR/vdradmind.pl
 	fi