summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--streams/Makefile9
l---------[-rwxr-xr-x]streams/deepmix27
l---------[-rwxr-xr-x]streams/groove17
l---------[-rwxr-xr-x]streams/radiotux30
-rwxr-xr-xstreams/stream-starter19
-rw-r--r--streams/stream.db3
-rwxr-xr-xstreams/streams7
7 files changed, 34 insertions, 78 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/deepmix b/streams/deepmix
index b8f8fba8..b0148d72 100755..120000
--- a/streams/deepmix
+++ b/streams/deepmix
@@ -1,26 +1 @@
-#! /bin/bash
-set -euf
-CMD="mplayer http://deepmix.ru/deepmix128.pls"
-function start() {
- stop
- tmux start-server
- tmux new-session -d "$CMD"
-}
-function stop() {
- pkill mplayer || :
-}
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- *)
- echo "aidsballs"
- ;;
-esac
+stream-starter \ No newline at end of file
diff --git a/streams/groove b/streams/groove
index 8c2faddd..b0148d72 100755..120000
--- a/streams/groove
+++ b/streams/groove
@@ -1,16 +1 @@
-#! /bin/bash
-set -euf
-STR=$PWD/streams
-case "$1" in
- start)
- $STR start groove
- stop)
- $STR stop
- ;;
- restart)
- $STR restart groove
- ;;
- *)
- echo "aidsballs"
- ;;
-esac
+stream-starter \ No newline at end of file
diff --git a/streams/radiotux b/streams/radiotux
index 9d671493..b0148d72 100755..120000
--- a/streams/radiotux
+++ b/streams/radiotux
@@ -1,29 +1 @@
-#! /bin/bash
-set -euf
-function stop()
-{
- pkill mplayer || true
-}
-
-CMD="while true; do exec mplayer http://streams.xenim.de/radiotux.ogg; sleep 1;done"
-case "$1" in
- start)
- stop
- if tmux list-sessions;
- then
- tmux new-window "$CMD" &
- else
- tmux new-session "$CMD" &
- fi
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- *)
- echo "aidsballs"
- ;;
-esac
+stream-starter \ No newline at end of file
diff --git a/streams/stream-starter b/streams/stream-starter
new file mode 100755
index 00000000..cfcf91d4
--- /dev/null
+++ b/streams/stream-starter
@@ -0,0 +1,19 @@
+#! /bin/bash
+set -euf
+HERE=`readlink -f $(dirname $0)`
+STR=$HERE/streams
+NAME=`basename $0`
+case "$1" in
+ start)
+ $STR start $NAME
+ ;;
+ stop)
+ $STR stop
+ ;;
+ restart)
+ $STR restart $NAME
+ ;;
+ *)
+ echo "aidsballs"
+ ;;
+esac
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 f3cbc300..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
@@ -19,7 +18,7 @@ function start() {
exit 1
fi
done; then
- echo "!! Stream not found!"
+ echo "!! Stream '$REQ' not found!"
exit 1
fi
}