Merge branch 'master' of github.com:krebscode/painload

2 files changed, 28 insertions, 2 deletions

diff --git a/streams/stream.db b/streams/stream.db
index 168cc68d..6ca9a627 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -1,3 +1,5 @@
 http://somafm.com/groovesalad.pls groove 
 http://deepmix.ru/deepmix128.pls deepmix
 http://streams.xenim.de/radiotux.ogg radiotux
+http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
+http://somafm.com/illstreet.pls illstreet
diff --git a/streams/streams b/streams/streams
index 034d68a1..c5e9e471 100755
--- a/streams/streams
+++ b/streams/streams
@@ -6,6 +6,11 @@ if [ ! `id -u` -eq "0" ]; then
   exec sudo "$0" "$@"
 fi
 
+#if [ ! `id -u` -eq "0" ]; then
+#  echo "we are going sudo..."
+#  exec sudo "$0" "$@"
+#fi
+
 function start() {
   # start the given stream von $1
   REQ=$1
@@ -71,7 +76,23 @@ function list()
 
 }
 
-
+function shorthelp()
+{
+    echo "start|stop|restart|status|list [audio stream]"
+}
+function longhelp()
+{
+  B=`basename $0`
+  echo -n "Usage: $B "
+  shorthelp
+  echo " get all available streams with '/$B list'
+Examples: 
+  $B list
+  $B start groove
+  $B restart deepmix
+  $B status
+  $B stop"
+}
 
 
 case "$1" in
@@ -92,7 +113,10 @@ case "$1" in
   list)
     list
     ;;
+  (--help)
+    shorthelp
+    ;;
   *)
-    echo "aidsballs"
+    longhelp
   ;;
 esac