src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch

   1 diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c
   2 --- epgsearch-1.0.1.beta2/epgsearch.c~  2012-06-11 20:01:54.000000000 +0300
   3 +++ epgsearch-1.0.1.beta2/epgsearch.c   2012-06-12 22:20:38.740086339 +0300
   4 @@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void)
   5     LoadConfD();
   6     LoadUserVars();
   7
   8 -   ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
   9 -   Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
  10 -   SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
  11 -   SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
  12 -   RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
  13 -   SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
  14 -   NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
  15 -   DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
  16 -   TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
  17 -   PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
  18 +   ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true);
  19 +   Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf");
  20 +   SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf");
  21 +   SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf");
  22 +   RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data");
  23 +   SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf");
  24 +   NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf");
  25 +   DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf");
  26 +   TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf");
  27 +   PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf");
  28
  29     cSearchTimerThread::Init(this);
  30     cSwitchTimerThread::Init();
  31 diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c
  32 --- epgsearch-1.0.1.beta2/epgsearchcfg.c~       2012-06-11 19:43:52.000000000 +0300
  33 +++ epgsearch-1.0.1.beta2/epgsearchcfg.c        2012-06-12 22:20:39.169055465 +0300
  34 @@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
  35    strcpy(MailAuthUser, "");
  36    strcpy(MailAuthPass, "");
  37    strcpy(LastMailConflicts, "");
  38 -  mailViaScript = 1;
  39 +  mailViaScript = 0;
  40    manualTimerCheckDefault = 0;
  41    noAnnounceWhileReplay = 0;
  42    TimerProgRepeat = 0;
  43 diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh
  44 --- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~     2012-06-12 22:19:28.570878733 +0300
  45 +++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh      2012-06-12 22:20:39.536029167 +0300
  46 @@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes
  47  SVDRPSEND=svdrpsend
  48
  49  # Home of EPGsearch
  50 -EPGSEARCH_HOME="/etc/vdr/plugins"
  51 +EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch"
  52
  53  # Video root
  54 -VIDEO_ROOT="/video"
  55 +VIDEO_ROOT="/var/video"
  56
  57  # do not edit below this line
  58  #------------------------------------------------------------------------------
  59 diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh
  60 --- epgsearch-1.0.1.beta2/scripts/recrep.sh~    2012-06-11 19:43:51.000000000 +0300
  61 +++ epgsearch-1.0.1.beta2/scripts/recrep.sh     2012-06-12 22:20:39.914002061 +0300
  62 @@ -15,7 +15,7 @@
  63  # adjust the following lines to your config
  64
  65  # your plugins config dir
  66 -PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
  67 +PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
  68  # path to svdrpsend
  69  SVDRPSEND=svdrpsend
  70  # the key used to call epgsearch
  71 diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh
  72 --- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300
  73 +++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh  2012-06-12 22:20:40.723944345 +0300
  74 @@ -15,7 +15,7 @@
  75  #<Configuration>
  76
  77  # Your timers.conf
  78 -TIMERS="/video/timers.conf"
  79 +TIMERS="/etc/vdr/timers.conf"
  80
  81  #</Configuration>
  82