From 196e08fc90a6ad099ed2912b42fb5f68b4ed8adc Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 21 May 2015 12:49:26 -0400
Subject: [PATCH] Fix bug where users can't connect to Master source due to
 hardcoded path in liquidsoap

---
 python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py | 3 +++
 python_apps/pypo/liquidsoap/ls_script.liq              | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py b/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
index 1b409b3c5..d8eb275dd 100644
--- a/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
+++ b/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
@@ -1,4 +1,5 @@
 import logging
+import os
 import sys
 import time
 import traceback
@@ -23,7 +24,9 @@ def generate_liquidsoap_config(ss):
         str_buffer = "%s = %s\n" % (key, val)
         fh.write(str_buffer.encode('utf-8'))
 
+    auth_path = os.path.dirname(os.path.realpath(__file__))
     fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
+    fh.write('auth_path = "%s/liquidsoap_auth.py"\n' % auth_path)
     fh.close()
     
 def run():
diff --git a/python_apps/pypo/liquidsoap/ls_script.liq b/python_apps/pypo/liquidsoap/ls_script.liq
index e4c2aa9d7..632cf6324 100644
--- a/python_apps/pypo/liquidsoap/ls_script.liq
+++ b/python_apps/pypo/liquidsoap/ls_script.liq
@@ -3,7 +3,7 @@
 set("log.file.path", log_file)
 set("server.telnet", true)
 set("server.telnet.port", 1234)
-set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
+# set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
 
 %include "library/pervasives.liq"
 
@@ -213,7 +213,7 @@ end
 def check_master_dj_client(user,password) =
     log("master connected")
     #get the output of the php script
-    ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --master #{user} #{password}")
+    ret = get_process_lines("python #{auth_path} --master #{user} #{password}")
     #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...
     ret = list.hd(ret)
 
@@ -224,7 +224,7 @@ end
 def check_dj_client(user,password) =
     log("live dj connected")
     #get the output of the php script
-    ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --dj #{user} #{password}")
+    ret = get_process_lines("python #{auth_path} --dj #{user} #{password}")
     #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...
     hd = list.hd(ret)
     log("Live DJ authenticated: #{hd}")