streams/* updated Makefile/stream now in file

Makefile: now creates symlinks to the krebs folder
stream.db: streams are stored in a file

4 files changed, 13 insertions, 7 deletions

diff --git a/streams/Makefile b/streams/Makefile
index 9f3076c0..dcf1ca45 100644
--- a/streams/Makefile
+++ b/streams/Makefile
@@ -1,10 +1,13 @@
-INITD = /etc/init.d/
+#INITD = /etc/init.d/
+INITD = /etc/rc.d/
 streams = groove deepmix radiotux
+CURRDIR = ${PWD}
 .PHONY: all
 .PHONY: $(streams)
 
 all: $(streams)
-	update-rc.d groove defaults
+	@update-rc.d groove defaults 2>/dev/null || echo "** put groove daemon in DAEMONS in /etc/rc.conf"
+
 
 $(streams):
-	cp $@ $(INITD)$@
+	ln -n -s -f $$PWD/stream-starter $(INITD)$@
diff --git a/streams/stream-starter b/streams/stream-starter
index 8f6c6a9d..cfcf91d4 100755
--- a/streams/stream-starter
+++ b/streams/stream-starter
@@ -1,6 +1,7 @@
 #! /bin/bash
 set -euf
-STR=$PWD/streams
+HERE=`readlink -f $(dirname $0)`
+STR=$HERE/streams
 NAME=`basename $0`
 case "$1" in
   start)
diff --git a/streams/stream.db b/streams/stream.db
new file mode 100644
index 00000000..168cc68d
--- /dev/null
+++ b/streams/stream.db
@@ -0,0 +1,3 @@
+http://somafm.com/groovesalad.pls groove 
+http://deepmix.ru/deepmix128.pls deepmix
+http://streams.xenim.de/radiotux.ogg radiotux
diff --git a/streams/streams b/streams/streams
index 01097aea..a2b5bee4 100755
--- a/streams/streams
+++ b/streams/streams
@@ -1,7 +1,6 @@
 #! /bin/sh
-URLS="http://somafm.com/groovesalad.pls groove 
-http://deepmix.ru/deepmix128.pls deepmix
-http://streams.xenim.de/radiotux.ogg radiotux"
+HERE=`readlink -f $(dirname $0)`
+URLS=`cat $HERE/stream.db`
 
 function start() {
   # start the given stream von $1