Merge pull request #631 from stefansaraev/vdr

vdr: vdr.start: initial configuration optinizations

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -97,33 +97,34 @@ fi
   cd $ADDON_DIR/config
   mkdir -p $ADDON_CONFIG_DIR
 
-  # copy live plugin html content
-  mkdir -p $ADDON_CONFIG_DIR/plugins/live
-  cp -PR plugins/live/* $ADDON_CONFIG_DIR/plugins/live
-
-  # copy vdr theme
-  if [ ! -d "$ADDON_CONFIG_DIR/plugins/text2skin/" ]; then
-    mkdir -p $ADDON_CONFIG_DIR/plugins/text2skin/
-    cp -a plugins/text2skin $ADDON_CONFIG_DIR/plugins/
-    cp -a themes $ADDON_CONFIG_DIR/
-
-    # is this in conflict with something else?
-    cat >$ADDON_CONFIG_DIR/setup.conf << MYDATA
-OSDSkin = anthra_1280_OS
-OSDTheme = yabluelight
-xineliboutput.OSD.Blending = 1
-MYDATA
-  fi
-
   for dir in `find . -type d`; do
     mkdir -p $ADDON_CONFIG_DIR/$dir
   done
 
-  for config in `find . -type f -name "*.conf*"`; do
+  for config in `find . -type f`; do
     if [ ! -f $ADDON_CONFIG_DIR/$config ]; then
       cp $config $ADDON_CONFIG_DIR/$config
     fi
   done
+
+  if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then
+    sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^OSDHeight.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^OSDSkin.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^OSDTheme.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^xineliboutput.OSD.Blending.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^xineliboutput.OSD.Size.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^xineliboutput.OSD.SoftOSD.*$/d' $ADDON_CONFIG_DIR/setup.conf
+  fi
+  cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
+OSDHeight = 1080
+OSDSkin = anthra_1280_OS
+OSDTheme = yabluelight
+xineliboutput.OSD.Blending = 1
+xineliboutput.OSD.Size = 1280x720
+xineliboutput.OSD.SoftOSD = 1
+MYDATA
+
 )
 
 if [ ! "$(pidof vdr.bin)" ];then