From bfffa4993aa63dedce7be4232aae8d38221674d4 Mon Sep 17 00:00:00 2001
From: Adam Boeglin <adamrb@gmail.com>
Date: Thu, 29 Dec 2011 16:55:20 -0500
Subject: [PATCH] Code cleanup to match Openelc conventions.

---
 packages/addons/service/multimedia/boblightd/addon |  8 +++++---
 packages/addons/service/multimedia/boblightd/build |  2 ++
 .../service/multimedia/boblightd/changelog.txt     |  4 ++--
 packages/addons/service/multimedia/boblightd/meta  |  4 ++--
 .../source/bin/{boblightd.service => boblightd}    | 14 ++++++++------
 .../service/multimedia/boblightd/source/default.py |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)
 rename packages/addons/service/multimedia/boblightd/source/bin/{boblightd.service => boblightd} (75%)

diff --git a/packages/addons/service/multimedia/boblightd/addon b/packages/addons/service/multimedia/boblightd/addon
index 7da1cc012e..703beafc6f 100755
--- a/packages/addons/service/multimedia/boblightd/addon
+++ b/packages/addons/service/multimedia/boblightd/addon
@@ -4,6 +4,8 @@
 #      This file is part of OpenELEC - http://www.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
 #  it under the terms of the GNU General Public License as published by
 #  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
 
 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/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblight-X11 $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/boblight-constant.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
   cp -R $PKG_DIR/config/*.sample $ADDON_BUILD/$PKG_ADDON_ID/config
diff --git a/packages/addons/service/multimedia/boblightd/build b/packages/addons/service/multimedia/boblightd/build
index e063e04e0d..ba6ff9d49c 100755
--- a/packages/addons/service/multimedia/boblightd/build
+++ b/packages/addons/service/multimedia/boblightd/build
@@ -4,6 +4,8 @@
 #      This file is part of OpenELEC - http://www.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
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt
index 35a6cd3f15..98f124e4dc 100644
--- a/packages/addons/service/multimedia/boblightd/changelog.txt
+++ b/packages/addons/service/multimedia/boblightd/changelog.txt
@@ -1,5 +1,5 @@
-2.0.401
+2.0.2
 - Renamed to boblightd to avoid conflicts
 
-2.0.400
+2.0.1
 - initial version boblight
diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta
index 48177d4701..be05ca82c3 100644
--- a/packages/addons/service/multimedia/boblightd/meta
+++ b/packages/addons/service/multimedia/boblightd/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="boblightd"
-PKG_VERSION="2.0.401"
-PKG_REV="1"
+PKG_VERSION="2.0.2"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
diff --git a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service b/packages/addons/service/multimedia/boblightd/source/bin/boblightd
similarity index 75%
rename from packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
rename to packages/addons/service/multimedia/boblightd/source/bin/boblightd
index 42280cb732..021ab69851 100755
--- a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
+++ b/packages/addons/service/multimedia/boblightd/source/bin/boblightd
@@ -4,6 +4,8 @@
 #      Copyright (C) 2009-2010 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
 #  it under the terms of the GNU General Public License as published by
 #  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"
 
 # 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
-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
 
@@ -45,7 +47,7 @@ if [ -e $BOBLIGHT_CONFIG ]; then
 	wait_for_xorg
 	
 	# 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
 
@@ -55,6 +57,6 @@ if [ -e $BOBLIGHT_X11 ]; then
         wait_for_xorg
 
         # 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
diff --git a/packages/addons/service/multimedia/boblightd/source/default.py b/packages/addons/service/multimedia/boblightd/source/default.py
index 4ec88185a9..50b4fbe1c5 100644
--- a/packages/addons/service/multimedia/boblightd/source/default.py
+++ b/packages/addons/service/multimedia/boblightd/source/default.py
@@ -27,6 +27,6 @@ __author__ = "OpenELEC"
 __url__ = "http://www.openelec.tv"
 __settings__   = xbmcaddon.Addon(id='service.multimedia.boblightd')
 __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__)