2005-06-22: 0.97-am3.3rcv0.97-am3.3rc

- Updated all help messages.
- Added beautified tooltips in timer_list. PLEASE COMMENT!!!
- Changed saving of AutoTimer patterns: ":" -> "|" and "|" -> "\|".
- Added support for user.css for overwriting style.css (Must be located in /etc/vdradmin/). See user.css.example. PLEASE COMMENT ON THIS!!!
- Removed obsolete files (e.g. images).
- Merged style.css and navi.css.
- Reworked templates so that they use a lot of CSS (Tested using Konqueror 3.3.2 and Firefox 1.0.4).
- Fixed programming timers with special summary when using EPG_DIRECT (timer didn't get programmed) (Thanks to HolgerAusB for giving vital hints).
- Allow browsers to cache all files VDRAdmin sends, except "text/html". This should speed up VDRAdmin but changing the skin or css needs a "shift reload".
- Added support for VDR v1.3.25's info.vdr (Submitted by vejoun).
- Use localized date formates.
- Now using "video/x-mpegurl" MIME type instead of "audio/x-mpegurl" for streaming (Suggested by stefan.h).
- Added patches supplied by stefan.h:
  -> using EPG's subtitle when found for AutoTimer else " " (that's the VDR way).
  -> New config option VDRVFAT to find recordings if VDR has been compiled with or without VFAT define.
- Fixed calling reccmds on recordings in subdirs, manual recordings (@rectitle) and repeating timer's recordings without episode title.
- Fixed streaming of manual recordings (@rectitle) and repeating timer's recordings without episode title.
- VDRAdmin-AM now uses the required charsets setting in templates, so no need to write "&xyz;" things in .po files.
- Reworked templates to make better use of CSS (for example: timeline colours can be set by style.css).
- EPG_PRUNE now is the number of channels to fetch from VDR (had been one too less before).
- Added "install.sh" and "uninstall.sh" ("./install.sh -h" for help) (Requested by several people).
- Made "name" columns in lists wrapping again (Reported by vejoun).
- Deleting a single recording works again (Reported by vejoun).
- Fixed streaming of recordings in subdirs (Reported by vejoun).
- Added missing gray sign on deactivated AutoTimers (Reported by vejoun).

1 files changed, 5 insertions, 3 deletions

diff --git a/install.sh b/install.sh
index daf77c3..803097e 100755
--- a/install.sh
+++ b/install.sh
@@ -17,6 +17,7 @@ LOGDIR=${LOGDIR:-$DESTDIR/var/log}
 PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid}
 VIDEODIR=${VIDEODIR:-/video}
 VDRCONF=${VDRCONF:-$VIDEODIR}
+EPGDATA=${EPGDATA:-$VIDEODIR/epg.data}
 
 LANGS="de es fr fi"
 
@@ -96,7 +97,7 @@ function doInstall()
 
 	[ ! -e $DOCDIR ] && mkdir -p $DOCDIR
 	if [ -d $DOCDIR ]; then
-  	cp -r contrib COPYING HISTORY* INSTALL README* $DOCDIR
+  	cp -r contrib COPYING HISTORY INSTALL README $DOCDIR
 	else
 		echo "$DOCDIR exists but is no directory!"
 		echo "Aborting..."
@@ -144,8 +145,9 @@ function doInstall()
   	    -e "s:/etc/vdradmin/vdradmind.at:${ETCDIR}/vdradmind.at:" \
   	    -e "s:/etc/vdradmin/vdradmind.bl:${ETCDIR}/vdradmind.bl:" \
   	    -e "s:/usr/share/locale:${LOCDIR}:" \
-  	    -e "s:$CONFIG{VIDEODIR} *= "/video";:${VIDEODIR}:" \
-				-e "s:$CONFIG{VDRCONFDIR} *= "$CONFIG{VIDEODIR}";:${VDRCONF}:"
+  	    -e "s:\(\$CONFIG{VIDEODIR} *= \)\"/video\";:\1\"${VIDEODIR}\";:" \
+				-e "s:\(\$CONFIG{VDRCONFDIR} *= \)\"\$CONFIG{VIDEODIR}\";:\1\"${VDRCONF}\";:" \
+				-e "s:\(\$CONFIG{EPG_FILENAME} *= \)\"\$CONFIG{VIDEODIR}/epg.data\";:\1\"${EPGDATA}\";:"
 
 		chmod a+x  $BINDIR/vdradmind.pl