From: yomguy <yomguy@parisson.com>
Date: Mon, 16 Jan 2012 15:27:17 +0000 (+0100)
Subject: fix deamon
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=df987871ec44d833987339caa4aa4bd3f19a4421;p=telecaster-cgi.git

fix deamon
---

diff --git a/conf/etc/init.d/stream-m b/conf/etc/init.d/stream-m
index 95259d6..c693bd7 100755
--- a/conf/etc/init.d/stream-m
+++ b/conf/etc/init.d/stream-m
@@ -8,7 +8,6 @@
 # Short-Description: init-Script for system wide fetchmail daemon
 ### END INIT INFO
 
-
 DAEMON=/usr/local/bin/stream-m
 USER=""
 CONF="/etc/stream-m/server.conf"
@@ -49,6 +48,7 @@ case "$1" in
                 pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
 		if [ ! pid = '' ]; then
                         kill -9 $pid
+                        pkill -9 -f 'stream-m'
         		log_end_msg 0
     		else
 	    		log_end_msg 1
diff --git a/install.py b/install.py
index 596c5fb..f23ae5e 100755
--- a/install.py
+++ b/install.py
@@ -106,7 +106,7 @@ class Install(object):
     def install_conf(self):
         os.chdir(self.app_dir)
 
-        for conf_dir in list(self.conf_dir, self.stream_m_conf_dir):
+        for conf_dir in [self.conf_dir, self.stream_m_conf_dir]:
             in_files = os.listdir('conf'+conf_dir)
             if not os.path.exists(conf_dir):
                 os.makedirs(conf_dir)
@@ -140,7 +140,7 @@ class Install(object):
         for init_dir in self.init_dirs:
             for daemon in self.daemons:
                 path = init_dir + daemon
-                shutil.copy('conf'+path, dir)
+                shutil.copy('conf'+path, path)
                 os.system('sudo chmod 755 '+path)
 
         init_link = '/etc/rc2.d/S97jackd'
diff --git a/vendor/stream-m/bin/stream-m b/vendor/stream-m/bin/stream-m
index 860830e..40ad945 100755
--- a/vendor/stream-m/bin/stream-m
+++ b/vendor/stream-m/bin/stream-m
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-java -cp /usr/local/lib/stream-m/lib/stream-m.jar StreamingServer $1
+cd /usr/local/lib/stream-m/
+java -cp lib/stream-m.jar StreamingServer $1