diff --git a/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc b/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc index dc1ce42edb..d241a5f2cc 100644 --- a/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc +++ b/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc @@ -45,9 +45,13 @@ progress "setup XBMC" mkdir -p $HOME/.xbmc/userdata - if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then - cat > $HOME/.xbmc/userdata/sources.xml << EOF - + if [ ! -f $HOME/.xbmc/userdata/sources.xml ]; then + if [ -f /usr/share/xbmc/config/sources.xml ]; then + # include project specific sources + cp /usr/share/xbmc/config/sources.xml $HOME/.xbmc/userdata + else + cat > $HOME/.xbmc/userdata/sources.xml << EOF + + EOF + fi fi # @@ -94,17 +99,17 @@ EOF EOF -# -# include project specific options -# + # + # include project specific options + # - if [ -f /usr/share/xbmc/config/guisettings.xml ]; then - cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml - fi + if [ -f /usr/share/xbmc/config/guisettings.xml ]; then + cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml + fi -# -# common setup for amd and nvidia graphic -# + # + # common setup for amd and nvidia graphic + # # Always sync to vblank if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install index 82877c0f3a..1238d95ca8 100755 --- a/packages/mediacenter/xbmc-pvr/install +++ b/packages/mediacenter/xbmc-pvr/install @@ -92,6 +92,10 @@ mkdir -p $PYTHON_LIBDIR/site-packages/xbmc cp -R $PROJECT_DIR/$PROJECT/xbmc/guisettings.xml $INSTALL/usr/share/xbmc/config fi + if [ -f $PROJECT_DIR/$PROJECT/xbmc/sources.xml ]; then + cp -R $PROJECT_DIR/$PROJECT/xbmc/sources.xml $INSTALL/usr/share/xbmc/config + fi + mkdir -p $INSTALL/usr/share/xbmc/system/ if [ -f $PROJECT_DIR/$PROJECT/xbmc/advancedsettings.xml ]; then cp $PROJECT_DIR/$PROJECT/xbmc/advancedsettings.xml $INSTALL/usr/share/xbmc/system/