From ceb7ce5b90365e81ed040d016e7b6368b364a718 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Thu, 5 May 2016 00:26:06 -0700
Subject: [PATCH] rename service.sh to moonlight.sh and fix spacing

---
 .../bin/{service.sh => moonlight.sh}          | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)
 rename script.moonlight/bin/{service.sh => moonlight.sh} (84%)

diff --git a/script.moonlight/bin/service.sh b/script.moonlight/bin/moonlight.sh
similarity index 84%
rename from script.moonlight/bin/service.sh
rename to script.moonlight/bin/moonlight.sh
index 4a4ae38..967c6e0 100644
--- a/script.moonlight/bin/service.sh
+++ b/script.moonlight/bin/moonlight.sh
@@ -4,18 +4,13 @@
 
 oe_setup_addon script.moonlight
 
-chmod a+x $ADDON_DIR/bin/*
+while [ 1 ]; do
+	if [ -f $ADDON_DIR/start_moonlight.tmp ]; then
 
-while [ 1 ]
-do
-	if [ -f $ADDON_DIR/start_moonlight.tmp ]
-	then
-		oe_setup_addon script.moonlight
-		
 		MOONLIGHT_APP=`cat $ADDON_DIR/start_moonlight.tmp`
-		
+
 		rm $ADDON_DIR/start_moonlight.tmp
-		
+
 		MOONLIGHT_ARG="stream"
 
 		if [ "$MOON_PACKETSIZE" != "0" ]; then
@@ -59,36 +54,34 @@ do
 		if [ "$MOON_REMOTE" = "true" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -remote"
 		fi
-		
+
 		if [ "$MOON_AUDIO" != "sysdefault" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -audio $MOON_AUDIO"
 		fi
 
 		if [ "$MOON_MAPPING" != "" ]; then
-			MOONLIGHT_ARG="$MOONLIGHT_ARG -mapping \"${ADDON_DIR}/bin/mappings/${MOON_MAPPING}.conf\""
+			MOONLIGHT_ARG="$MOONLIGHT_ARG -mapping \"${ADDON_DIR}/share/moonlight/mappings/${MOON_MAPPING}.conf\""
 		fi
-		
+
 		if [ "$MOONLIGHT_APP" != "" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -app \"${MOONLIGHT_APP}\""
 		fi
-		
+
 		MOONLIGHT_ARG="$MOONLIGHT_ARG -keydir \"${ADDON_HOME}/keys\""
 
 		if [ "$MOON_SERVER_IP" != "0.0.0.0" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG $MOON_SERVER_IP"
 		fi
-		
-		if pgrep "kodi.bin" > /dev/null
-		then
+
+		if pgrep "kodi.bin" > /dev/null; then
 			systemctl stop kodi
 		fi
-		
-		modprobe snd_bcm2835
+
+		modprobe snd_bcm2835 || :
 		echo $MOONLIGHT_ARG >> $ADDON_LOG_FILE
 		/bin/sh -c "${ADDON_DIR}/bin/moonlight ${MOONLIGHT_ARG} > ${ADDON_LOG_FILE} 2>&1"
-		rmmod snd_bcm2835
+		rmmod snd_bcm2835 || :
 		systemctl start kodi
 	fi
-	
 	sleep 1
 done