kodi: merge kodi-hacks/kodi-sources into kodi-config

This commit is contained in:
Stefan Saraev 2015-01-18 17:19:08 +02:00
parent 673fcfd4dc
commit dfd56decd3
8 changed files with 65 additions and 145 deletions

View File

@ -0,0 +1,5 @@
<settings>
<debug>
<screenshotpath pathversion="1">$HOME/screenshots/</screenshotpath>
</debug>
</settings>

View File

@ -0,0 +1,31 @@
<sources>
<video>
<default pathversion="1"></default>
<source>
<name>Videos</name>
<path pathversion="1">$HOME/videos/</path>
<allowsharing>true</allowsharing>
</source>
<source>
<name>TV Shows</name>
<path pathversion="1">$HOME/tvshows/</path>
<allowsharing>true</allowsharing>
</source>
</video>
<music>
<default pathversion="1"></default>
<source>
<name>Music</name>
<path pathversion="1">$HOME/music/</path>
<allowsharing>true</allowsharing>
</source>
</music>
<pictures>
<default pathversion="1"></default>
<source>
<name>Pictures</name>
<path pathversion="1">$HOME/pictures/</path>
<allowsharing>true</allowsharing>
</source>
</pictures>
</sources>

View File

@ -415,8 +415,6 @@ post_makeinstall_target() {
mkdir -p $INSTALL/usr/lib/kodi mkdir -p $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/kodi-config $INSTALL/usr/lib/kodi cp $PKG_DIR/scripts/kodi-config $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/kodi.sh $INSTALL/usr/lib/kodi cp $PKG_DIR/scripts/kodi.sh $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/kodi-hacks $INSTALL/usr/lib/kodi
cp $PKG_DIR/scripts/kodi-sources $INSTALL/usr/lib/kodi
mkdir -p $INSTALL/usr/lib/openelec mkdir -p $INSTALL/usr/lib/openelec
cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/openelec cp $PKG_DIR/scripts/systemd-addon-wrapper $INSTALL/usr/lib/openelec
@ -453,8 +451,11 @@ post_makeinstall_target() {
mkdir -p $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/kodi mkdir -p $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/kodi
cp -R tools/EventClients/lib/python/* $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/kodi cp -R tools/EventClients/lib/python/* $INSTALL/usr/lib/python"$PYTHON_VERSION"/site-packages/kodi
# install project specific configs
mkdir -p $INSTALL/usr/share/kodi/config mkdir -p $INSTALL/usr/share/kodi/config
cp $PKG_DIR/config/guisettings.xml $INSTALL/usr/share/kodi/config
cp $PKG_DIR/config/sources.xml $INSTALL/usr/share/kodi/config
# install project specific configs
if [ -f $PROJECT_DIR/$PROJECT/kodi/guisettings.xml ]; then if [ -f $PROJECT_DIR/$PROJECT/kodi/guisettings.xml ]; then
cp -R $PROJECT_DIR/$PROJECT/kodi/guisettings.xml $INSTALL/usr/share/kodi/config cp -R $PROJECT_DIR/$PROJECT/kodi/guisettings.xml $INSTALL/usr/share/kodi/config
fi fi
@ -494,8 +495,6 @@ post_install() {
# enable default services # enable default services
enable_service kodi-autostart.service enable_service kodi-autostart.service
enable_service kodi-cleanlogs.service enable_service kodi-cleanlogs.service
enable_service kodi-hacks.service
enable_service kodi-sources.service
enable_service kodi-halt.service enable_service kodi-halt.service
enable_service kodi-poweroff.service enable_service kodi-poweroff.service
enable_service kodi-reboot.service enable_service kodi-reboot.service

View File

@ -17,6 +17,31 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>. # along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
# hack: make addon-bins executable
# TODO remove
chmod +x /storage/.kodi/addons/*/bin/*
# hack: update RSSnews.xml in userdata
if [ -f /storage/.kodi/userdata/RssFeeds.xml ]; then
sed -e "s,http://openelec.tv/news?format=feed&type=rss,http://feeds.openelec.tv/news,g" \
-i /storage/.kodi/userdata/RssFeeds.xml
fi
# setup Kodi sources
if [ ! -f $HOME/.kodi/userdata/sources.xml ]; then
if [ -f /usr/share/kodi/config/sources.xml ]; then
cp /usr/share/kodi/config/sources.xml $HOME/.kodi/userdata
fi
fi
# common setup guisettings
if [ ! -f $HOME/.kodi/userdata/guisettings.xml ] ; then
if [ -f /usr/share/kodi/config/guisettings.xml ]; then
cp /usr/share/kodi/config/guisettings.xml $HOME/.kodi/userdata
fi
fi
if [ -e /run/lirc/lircd.irtrans ]; then if [ -e /run/lirc/lircd.irtrans ]; then
KODI_ARGS="--lircdev /run/lirc/lircd.irtrans" KODI_ARGS="--lircdev /run/lirc/lircd.irtrans"
else else

View File

@ -1,27 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
# hack: make addon-bins executable
chmod +x /storage/.kodi/addons/*/bin/*
# hack: update RSSnews.xml in userdata
if [ -f /storage/.kodi/userdata/RssFeeds.xml ]; then
sed -e "s,http://openelec.tv/news?format=feed&type=rss,http://feeds.openelec.tv/news,g" \
-i /storage/.kodi/userdata/RssFeeds.xml
fi

View File

@ -1,89 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
. /etc/profile
#
# setup XBMC sources
#
if [ ! -f $HOME/.kodi/userdata/sources.xml ]; then
if [ -f /usr/share/kodi/config/sources.xml ]; then
# include project specific sources
cp /usr/share/kodi/config/sources.xml $HOME/.kodi/userdata
else
cat > $HOME/.kodi/userdata/sources.xml << EOF
<sources>
<video>
<default pathversion="1"></default>
<source>
<name>Videos</name>
<path pathversion="1">$HOME/videos/</path>
<allowsharing>true</allowsharing>
</source>
<source>
<name>TV Shows</name>
<path pathversion="1">$HOME/tvshows/</path>
<allowsharing>true</allowsharing>
</source>
</video>
<music>
<default pathversion="1"></default>
<source>
<name>Music</name>
<path pathversion="1">$HOME/music/</path>
<allowsharing>true</allowsharing>
</source>
</music>
<pictures>
<default pathversion="1"></default>
<source>
<name>Pictures</name>
<path pathversion="1">$HOME/pictures/</path>
<allowsharing>true</allowsharing>
</source>
</pictures>
</sources>
EOF
fi
fi
#
# common setup guisettings
#
if [ ! -f $HOME/.kodi/userdata/guisettings.xml ] ; then
echo "<settings>" > $HOME/.kodi/userdata/guisettings.xml
cat >> $HOME/.kodi/userdata/guisettings.xml << EOF
<debug>
<screenshotpath pathversion="1">$HOME/screenshots/</screenshotpath>
</debug>
EOF
#
# include project specific options
#
if [ -f /usr/share/kodi/config/guisettings.xml ]; then
cat /usr/share/kodi/config/guisettings.xml >> $HOME/.kodi/userdata/guisettings.xml
fi
echo "</settings>" >> $HOME/.kodi/userdata/guisettings.xml
fi

View File

@ -1,12 +0,0 @@
[Unit]
Description=Kodi hacks
Before=kodi.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/kodi/kodi-hacks
RemainAfterExit=yes
[Install]
WantedBy=kodi.service

View File

@ -1,12 +0,0 @@
[Unit]
Description=Kodi sources Setup
Before=kodi.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/kodi/kodi-sources
RemainAfterExit=yes
[Install]
WantedBy=kodi.service