Fix merge conflict

kusti8 · May 10, 2016 · 85c2537 · 85c2537
2 parents e6e3c5e + 3406cd4
commit 85c2537
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/install.sh b/install.sh
@@ -13,4 +13,3 @@ sudo mkdir /etc/chromium-browser/native-messaging-hosts
 sudo cp native/run_omx.json /etc/chromium-browser/native-messaging-hosts/
 chromium-browser chrome://extensions &
 sudo leafpad /etc/chromium-browser/native-messaging-hosts/run_omx.json
-
diff --git a/native/rpi-youtube_5.0.0-1.deb b/native/rpi-youtube_5.0.0-1.deb
diff --git a/native/rpi-youtube_5.0.1-1.deb b/native/rpi-youtube_5.0.1-1.deb
diff --git a/native/run_omxplayer.py b/native/run_omxplayer.py
@@ -48,6 +48,6 @@ def read_thread_func():
 try:
     urllib2.urlopen('http://localhost:9192')
 except:
-    subprocess.Popen(['nohup', 'ytdl_server.py', '&'], stdout=FNULL)
+    subprocess.Popen(['nohup', 'start_ytdl_server.sh', '&'], stdout=FNULL)
 
 subprocess.call("omxplayergui ytdl " + url, shell=True)
diff --git a/native/start_ytdl_server.sh b/native/start_ytdl_server.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+ytdl_server.py > /dev/null 2>&1 &
+
+while ((1)); do
+    if pgrep chromium-browse > /dev/null
+    then
+        #Fine
+        echo "HI" > /dev/null
+    else
+        wget -qO /dev/null http://localhost:9192/stop
+        exit 0
+    fi
+    sleep 5
+done
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,3 @@ sudo mkdir /etc/chromium-browser/native-messaging-hosts
		sudo cp native/run_omx.json /etc/chromium-browser/native-messaging-hosts/
		chromium-browser chrome://extensions &
		sudo leafpad /etc/chromium-browser/native-messaging-hosts/run_omx.json