Merge pull request #145 from magister52/master

Fix Boblight Daemon so it won't start if it's already running.

packages/addons/service/multimedia/boblightd/changelog.txt

@@ -1,3 +1,6 @@
+2.0.4
+- Fixed so that boblightd will not start it's already running
+
 2.0.3
 - Removed LD_LIBRARY_PATH dependencies
 

packages/addons/service/multimedia/boblightd/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="boblightd"
-PKG_VERSION="2.0.3"
+PKG_VERSION="2.0.4"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"

packages/addons/service/multimedia/boblightd/source/bin/boblightd.service

@@ -37,24 +37,30 @@ BOBLIGHT_CONFIG="$ADDON_HOME/boblight.conf"
 # Flag file to start boblight-x11 daemon
 BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
 
+export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
+
 cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
 
-if [ -e $BOBLIGHT_CONFIG ]; then
+if [ ! $(pidof boblightd) ]; then
-
+	if [ -e $BOBLIGHT_CONFIG ]; then
-	# Make sure the xserver has started up
-	wait_for_xorg
 	
-	# Start the boblight daemon
+		# Make sure the xserver has started up
-	boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1
+		wait_for_xorg
-
+		
+		# Start the boblight daemon
+		boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1
+	
+	fi
 fi
 
-if [ -e $BOBLIGHT_X11 ]; then
+if [ ! $(pidof boblight-X11) ]; then                                               
-
+	if [ -e $BOBLIGHT_X11 ]; then
-        # Make sure the xserver has started up
+	
-        wait_for_xorg
+	        # Make sure the xserver has started up
-
+	        wait_for_xorg
-        # Start the boblight daemon
+	
-        boblight-X11 -f >> $LOG_FILE 2>&1
+	        # Start the boblight daemon
-
+	        boblight-X11 -f >> $LOG_FILE 2>&1
+	
+	fi
 fi