summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUdo Richter <udo_richter@gmx.de>2010-06-06 16:23:51 (GMT)
committerUdo Richter <udo_richter@gmx.de>2013-10-09 20:59:10 (GMT)
commit0057cbc61992106aa8294555c3f0d73da02bdf50 (patch)
tree7efa4f26d339c663c7414b9f0e0e207232ca4231
parent3d2787909c074f4425ff23fdfd0471fb45881b70 (diff)
downloadrunvdr-extreme-0057cbc61992106aa8294555c3f0d73da02bdf50.tar.gz
runvdr-extreme-0057cbc61992106aa8294555c3f0d73da02bdf50.tar.bz2
New: If runvdr is invoked as XYZ, check for ~/.XYZ.conf and /etc/XYZ.conf
-rw-r--r--HISTORY1
-rwxr-xr-xrunvdr7
2 files changed, 8 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index a2ba5c7..534850f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,6 +5,7 @@ xxxx-xx-xx:
- Fix: Debian init script: Pull default locale
- Fix: Fail to load if AddPlugin is last in runvdr.conf
- Fix: Error message if runvdr.conf fails
+- New: If runvdr is invoked as XYZ, check for ~/.XYZ.conf and /etc/XYZ.conf
2009-06-28: Version 0.4.2
- New: Support -i and --instance of VDR-1.7.4+
diff --git a/runvdr b/runvdr
index 54b95ca..e0cce12 100755
--- a/runvdr
+++ b/runvdr
@@ -24,6 +24,7 @@
# The project's page is at http://www.udo-richter.de/vdr/scripts.html#runvdr
+RUNVDR="${0##*/}"
RUNVDRCONF=""
@@ -333,6 +334,12 @@ function LoadConfFile() {
VDRUSER=""
# Old option, supported for compatibility only
+ if [ -z "$RUNVDRCONF" -a -r ~/.$RUNVDR.conf ] ; then
+ RUNVDRCONF=~/.$RUNVDR.conf
+ fi
+ if [ -z "$RUNVDRCONF" -a -r /etc/$RUNVDR.conf ] ; then
+ RUNVDRCONF=/etc/$RUNVDR.conf
+ fi
if [ -z "$RUNVDRCONF" -a -r ~/.runvdr.conf ] ; then
RUNVDRCONF=~/.runvdr.conf
fi