summaryrefslogtreecommitdiffstats
path: root/streams
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-06-08 18:36:41 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-06-08 18:36:41 +0200
commite4cbea08bfb27027d7fe15c49d77d92e7b86e99e (patch)
tree1ff529e9a9e0af5f9d74b38c806e42584a43df9b /streams
parent2876d3eac2a66fdd5e9e589f475de94a9789dc89 (diff)
parent957f3ca5356c6a0d75803c1c131758b383193f14 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'streams')
-rwxr-xr-xstreams/deepmix5
-rwxr-xr-xstreams/groove7
2 files changed, 5 insertions, 7 deletions
diff --git a/streams/deepmix b/streams/deepmix
index 89a1ce8e..b8f8fba8 100755
--- a/streams/deepmix
+++ b/streams/deepmix
@@ -3,9 +3,8 @@ set -euf
CMD="mplayer http://deepmix.ru/deepmix128.pls"
function start() {
stop
- tmux list-sessions &&
- tmux new-window "$CMD" ||
- tmux new-session "$CMD" ||
+ tmux start-server
+ tmux new-session -d "$CMD"
}
function stop() {
pkill mplayer || :
diff --git a/streams/groove b/streams/groove
index f3e3719a..935a16d9 100755
--- a/streams/groove
+++ b/streams/groove
@@ -1,11 +1,10 @@
#! /bin/bash
set -euf
-CMD="mplayer http://somafm.com/groovesalad.pls"
+CMD="exec mplayer http://somafm.com/groovesalad.pls"
function start() {
stop
- tmux list-sessions &&
- tmux new-window "$CMD" ||
- tmux new-session "$CMD" ||
+ tmux start-server
+ tmux new-session -d "$CMD"
}
function stop()
{