5 files changed, 22 insertions, 72 deletions
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..8f6c6a9d
--- /dev/null
+++ b/streams/stream-starter
@@ -0,0 +1,18 @@
+#! /bin/bash
+set -euf
+STR=$PWD/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/streams b/streams/streams
index f3cbc300..01097aea 100755
--- a/streams/streams
+++ b/streams/streams
@@ -19,7 +19,7 @@ function start() {
       exit 1
     fi
   done; then
-    echo "!! Stream not found!"
+    echo "!! Stream '$REQ' not found!"
     exit 1
   fi
 }