Code cleanup to match Openelc conventions.

This commit is contained in:
Adam Boeglin 2011-12-29 16:55:20 -05:00
parent c3d7c50fde
commit bfffa4993a
6 changed files with 20 additions and 14 deletions

View File

@ -4,6 +4,8 @@
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# #
# Boblightd addon maintained by Adam Boeglin: adamrb@gmail.com
#
# This Program is free software; you can redistribute it and/or modify # This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option) # the Free Software Foundation; either version 2, or (at your option)
@ -26,9 +28,9 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -P $PKG_BUILD/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $PKG_BUILD/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin/boblightd.bin
cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin/boblight-constant.bin
cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin/boblight-X11.bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
cp -R $PKG_DIR/config/*.sample $ADDON_BUILD/$PKG_ADDON_ID/config cp -R $PKG_DIR/config/*.sample $ADDON_BUILD/$PKG_ADDON_ID/config

View File

@ -4,6 +4,8 @@
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# #
# Boblightd addon maintained by Adam Boeglin: adamrb@gmail.com
#
# This Program is free software; you can redistribute it and/or modify # This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option) # the Free Software Foundation; either version 2, or (at your option)

View File

@ -1,5 +1,5 @@
2.0.401 2.0.2
- Renamed to boblightd to avoid conflicts - Renamed to boblightd to avoid conflicts
2.0.400 2.0.1
- initial version boblight - initial version boblight

View File

@ -19,8 +19,8 @@
################################################################################ ################################################################################
PKG_NAME="boblightd" PKG_NAME="boblightd"
PKG_VERSION="2.0.401" PKG_VERSION="2.0.2"
PKG_REV="1" PKG_REV="2"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://code.google.com/p/boblight" PKG_SITE="http://code.google.com/p/boblight"

View File

@ -4,6 +4,8 @@
# Copyright (C) 2009-2010 OpenELEC.tv # Copyright (C) 2009-2010 OpenELEC.tv
# http://www.openelec.tv # http://www.openelec.tv
# #
# Boblightd addon maintained by Adam Boeglin: adamrb@gmail.com
#
# This Program is free software; you can redistribute it and/or modify # This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option) # the Free Software Foundation; either version 2, or (at your option)
@ -30,14 +32,14 @@ mkdir -p $ADDON_HOME
LOG_FILE="$ADDON_HOME/service.log" LOG_FILE="$ADDON_HOME/service.log"
# Boblight config file created by user # Boblight config file created by user
BOBLIGHT_CONFIG="/storage/.config/boblight.conf" BOBLIGHT_CONFIG="$ADDON_HOME/boblight.conf"
# Flag file to start boblight-x11 daemon # Flag file to start boblight-x11 daemon
BOBLIGHT_X11="/storage/.config/boblight.X11" BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
export LD_LIBRARY_PATH="$ADDON_DIR/lib" export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
cp -R $ADDON_DIR/config/*.sample /storage/.config/ > $LOG_FILE 2>&1 cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
if [ -e $BOBLIGHT_CONFIG ]; then if [ -e $BOBLIGHT_CONFIG ]; then
@ -45,7 +47,7 @@ if [ -e $BOBLIGHT_CONFIG ]; then
wait_for_xorg wait_for_xorg
# Start the boblight daemon # Start the boblight daemon
$ADDON_DIR/bin/boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" $ADDON_DIR/bin/boblightd.bin -c $BOBLIGHT_CONFIG -f $@ >> $LOG_FILE 2>&1
fi fi
@ -55,6 +57,6 @@ if [ -e $BOBLIGHT_X11 ]; then
wait_for_xorg wait_for_xorg
# Start the boblight daemon # Start the boblight daemon
$ADDON_DIR/bin/boblight-X11 -f >> $LOG_FILE 2>&1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" $ADDON_DIR/bin/boblight-X11.bin -f $@ >> $LOG_FILE 2>&1
fi fi

View File

@ -27,6 +27,6 @@ __author__ = "OpenELEC"
__url__ = "http://www.openelec.tv" __url__ = "http://www.openelec.tv"
__settings__ = xbmcaddon.Addon(id='service.multimedia.boblightd') __settings__ = xbmcaddon.Addon(id='service.multimedia.boblightd')
__cwd__ = __settings__.getAddonInfo('path') __cwd__ = __settings__.getAddonInfo('path')
__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "boblightd.service") ) __path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "boblightd") )
os.system(__path__) os.system(__path__)