summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Reimer <manuel.reimer@gmx.de>2013-10-03 15:53:21 (GMT)
committerManuel Reimer <manuel.reimer@gmx.de>2013-10-03 15:53:21 (GMT)
commitfb2d3882a8ee38e00a1321c3307df8c5ff6a131b (patch)
tree116db6635b61efa284a45ba138ee7377214d1e72
parent1172a51f1c9c1937c087a2da2e0886a008fc8864 (diff)
downloadrunvdr-extreme-fb2d3882a8ee38e00a1321c3307df8c5ff6a131b.tar.gz
runvdr-extreme-fb2d3882a8ee38e00a1321c3307df8c5ff6a131b.tar.bz2
Added support for --cachedir and --resdir
-rw-r--r--HISTORY1
-rwxr-xr-xrunvdr18
-rw-r--r--runvdr.conf.example6
3 files changed, 22 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index b77e42f..b7bc6ef 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,7 @@ runvdr extreme Revision History
201x-xx-xx: Version 0.5.0
- New: If VDRPRG is not given, runvdr-extreme defaults to "vdr" in $PATH
+- New: Support for --dirnames, --cachedir and --resdir
- Fix: VDR_CHARSET_OVERRIDE now is correctly exported to the VDR process
- Fix: Fixed problem with closed STDOUT with newer versions of "ps"
diff --git a/runvdr b/runvdr
index eb0a4d8..34231a9 100755
--- a/runvdr
+++ b/runvdr
@@ -73,10 +73,11 @@ DATE="date"
# Supported options of VDR
#
# -a # --audio # AUDIO send Dolby Digital audio to stdin of command #
+# --cachedir=# CACHEDIR save cache files in DIR
# -c # --config # CONFIGDIR read config files from DIR
# -d --daemon DAEMON run in daemon mode
# -D # --device # DVBDEVICE use only the given DVB device (NUM = 0, 1, 2...)
-# --dirnames # DIRNAMES Changes recording directory name format
+# --dirnames=# DIRNAMES Changes recording directory name format
# -E # --epgfile # EPGFILE write the EPG data into the given FILE. - to disable.
# -g # --grab # GRAB write images from the SVDRP command GRAB into the given DIR;
# -L # --lib # LIBDIR search for plugins in DIR (default is %s)
@@ -90,6 +91,7 @@ DATE="date"
# -p # --port # SVDRPPORT use PORT for SVDRP
# --rcu #? RCU use a remote control device, attached to PATH
# -r # --record # RECORDCMD call CMD before and after a recording
+# --resdir=# RESDIR read resource files from DIR
# -s # --shutdown # SHUTDOWN call CMD to shutdown the computer
# -t # --terminal # TERMINAL controlling tty
# -u # --user # USER run as user USER; only applicable if started as root
@@ -120,8 +122,8 @@ function ParseCommandLine_Step1() {
runvdr-pid:,dvb-load:,dvb-unload:,dvb-unload-on-exit,x-startup:,\
x-shutdown:,language:,charset-override:,wrapper:,\
term-timeout:,kill-timeout:,terminate::,restart::,dvb-restart::,\
- wait::,audio:,config:,daemon,device:,dirnames:,epgfile:,grab:,help,lib:,lirc::,\
- instance:,log:,localedir:,mute,no-kbd,plugin:,port:,rcu::,record:,shutdown:,\
+ wait::,audio:,cachedir:,config:,daemon,device:,dirnames:,epgfile:,grab:,help,lib:,lirc::,\
+ instance:,log:,localedir:,mute,no-kbd,plugin:,port:,rcu::,record:,resdir:,shutdown:,\
terminal:,user:,userdump,version,vfat,video:,watchdog:"
# prepare all optios for later processing
@@ -159,6 +161,7 @@ function ParseCommandLine_Step1() {
-V|--version) shift ;;
-a|--audio) shift 2;;
+ --cachedir) shift 2;;
-c|--config) shift 2;;
-d|--daemon) shift ;;
-D|--device) shift 2;;
@@ -176,6 +179,7 @@ function ParseCommandLine_Step1() {
-P|--plugin) shift 2;;
--rcu) shift 2;;
-r|--record) shift 2;;
+ --resdir) shift 2;;
-s|--shutdown) shift 2;;
-t|--terminal) shift 2;;
-u|--user) shift 2;;
@@ -225,6 +229,7 @@ function Clean() {
VERSION=
AUDIO=
+ CACHEDIR=
CONFIGDIR=
DAEMON=
DVBDEVICE=()
@@ -241,6 +246,7 @@ function Clean() {
PLUGINS=()
SVDRPPORT=
RECORDCMD=
+ RESDIR=
RCU=
SHUTDOWN=
TERMINAL=
@@ -409,6 +415,7 @@ function ParseCommandLine_Step2() {
-a|--audio) AUDIO="$2"; shift 2;;
+ --cachedir) CACHEDIR="$2"; shift 2;;
-c|--config) CONFIGDIR="$2"; shift 2;;
-d|--daemon) DAEMON=1; shift ;;
-D|--device) AddDevice "$2"; shift 2;;
@@ -426,6 +433,7 @@ function ParseCommandLine_Step2() {
-P|--plugin) AddPluginString "$2"; shift 2;;
--rcu) RCU="$2"; shift 2;;
-r|--record) RECORDCMD="$2"; shift 2;;
+ --resdir) RESDIR="$2"; shift 2;;
-s|--shutdown) SHUTDOWN="$2"; shift 2;;
-t|--terminal) TERMINAL="$2"; shift 2;;
-u|--user) USER="$2"; shift 2;;
@@ -488,6 +496,7 @@ runvdr Options:
Parsed VDR options:
-a # --audio=# send Dolby Digital audio to stdin of command CMD
+ --cachedir=# save cache files in DIR
-c # --config=# read config files from DIR
-d --daemon run in daemon mode
-D # --device=# use only the given DVB device (NUM = 0, 1, 2...)
@@ -515,6 +524,7 @@ Parsed VDR options:
-p # --port=# use PORT for SVDRP
--rcu[=#] use a remote control device, attached to PATH
-r # --record=# call CMD before and after a recording
+ --resdir=# read resource files from DIR
-s # --shutdown=# call CMD to shutdown the computer
-t # --terminal=# controlling tty
-u # --user=# run as user USER; only applicable if started as root
@@ -557,6 +567,7 @@ function BuildCommand() {
[ "${#ADDPARAMS[*]}" -gt 0 ] && AddCommandLine "${ADDPARAMS[@]}"
[ -n "$AUDIO" ] && AddCommandLine -a "$AUDIO"
+ [ -n "$CACHEDIR" ] && AddCommandLine --cachedir="$CACHEDIR"
[ -n "$CONFIGDIR" ] && AddCommandLine -c "$CONFIGDIR"
[ -n "$DAEMON" ] && AddCommandLine -d
@@ -603,6 +614,7 @@ function BuildCommand() {
*) AddCommandLine --rcu="$RCU";;
esac
+ [ -n "$RESDIR" ] && AddCommandLine --resdir="$RESDIR"
[ -n "$SHUTDOWN" ] && AddCommandLine -s "$SHUTDOWN"
[ -n "$TERMINAL" ] && AddCommandLine -t "$TERMINAL"
[ -n "$USER" ] && AddCommandLine -u "$USER"
diff --git a/runvdr.conf.example b/runvdr.conf.example
index 2d03d4c..cf6c699 100644
--- a/runvdr.conf.example
+++ b/runvdr.conf.example
@@ -54,6 +54,12 @@ CONFIGDIR="/video"
#
# LOCALEDIR="/usr/src/vdr/locale"
+# Location where VDR and plugins save cache files
+CACHEDIR=
+
+# Location from where plugins read resource files
+RESDIR=
+
##### -----------
##### Plugins
##### -----------