fix deamon

diff --git a/conf/etc/init.d/stream-m b/conf/etc/init.d/stream-m
index 95259d6f7c0e5105689febb53721e5bd7db90a43..c693bd71b3a65908d47741f642cf1747550a4209 100755 (executable)
--- 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 596c5fb7a95c2107c9fe509f74837918ba52029d..f23ae5e28b7ec24b5e246570ca729d699940c78b 100755 (executable)
--- 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 860830ef3a28698c223a673f05cf18ca860f3328..40ad9459d389bf816617c5b15c890f427c773821 100755 (executable)
--- 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