Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-05-15 17:25:30 +02:00
commit 3fa9b9dcbf

View File

@ -42,6 +42,8 @@ fi
mkdir -p /var/config
cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default
cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf
mkdir -p /var/lib/epgsources
cp $ADDON_DIR/config/epgsources/epgdata2xmltv/epgdata2xmltv.dist /var/lib/epgsources/epgdata2xmltv
. /var/config/vdr.conf.default
. /var/config/vdr.conf
@ -115,6 +117,7 @@ fi
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
sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
fi
cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
OSDHeight = 1080
@ -123,6 +126,7 @@ OSDTheme = yabluelight
xineliboutput.OSD.Blending = 1
xineliboutput.OSD.Size = 1280x720
xineliboutput.OSD.SoftOSD = 1
epgsearch.SVDRPPort = 2004
MYDATA
)