Update soundtest

diff --git a/debian/changelog b/debian/changelog
index 01de581..b13b46f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ grml-scripts (1.1.3) unstable; urgency=low
 
   * grml-mutt: deactivate force_name, and save_name by default,
     activate quit=ask-yes by default. Thanks, Michael Hammer.
+  * soundtest: improve checks for player and install a symlink
+    /usr/bin/grml-soundtest pointing to /usr/bin/soundtest.
+    Thanks, Darshaka Pathirana. [Closes: issue360]
 
  -- Michael Prokop <mika@grml.org>  Sat, 19 Jan 2008 16:59:03 +0100
 

diff --git a/debian/rules b/debian/rules
index 4b563da..b1ccc30 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,6 +62,7 @@ binary-arch: build install
        manpages/iso-term.1 manpages/alignmargins.8 manpages/get_3ware.1 \
        manpages/grml-init-multitail.1
 #      cp --no-dereference man/*.1.gz debian/grml-scripts/usr/share/man/man1/
+       dh_link /usr/bin/soundtest /usr/bin/grml-soundtest
        dh_link /usr/sbin/blacklist /usr/sbin/unblacklist \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/align.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/apt-check-sigs.1.gz \
@@ -102,6 +103,7 @@ binary-arch: build install
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-muttng.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-nessus.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-postfix.1.gz \
+               /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-soundtest.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-screen.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-lang.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-resolution.1.gz \

diff --git a/usr_bin/soundtest b/usr_bin/soundtest
index b3b3395..73d87b8 100755 (executable)
--- a/usr_bin/soundtest
+++ b/usr_bin/soundtest
@@ -4,15 +4,30 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sun Jan 15 22:46:13 CET 2006 [mika]
+# Latest change: Sam Jän 19 17:08:34 CET 2008 [mika]
 ################################################################################
 
 PN=`basename "$0"`
-[ -z "$PLAYER" ] && PLAYER="ogg123"
+
+if [ -z "$PLAYER" ] ; then
+   [ -x /usr/bin/mplayer ] && PLAYER="mplayer"
+   [ -x /usr/bin/ogg123 ]  && PLAYER="ogg123"
+fi
+
+if ! [ $(which $PLAYER) ] ; then
+   echo "Sorry, neither mplayer nor ogg123 available and \$PLAYER is not set.">&2
+   exit 1
+fi
+
 if [ -z "$1" ] ; then
-  FILE="/usr/share/grml/effect.ogg"
+   FILE="/usr/share/grml/effect.ogg"
 else
-  FILE="$*"
+   FILE="$*"
+fi
+
+if ! [ -r "$FILE" ] ; then
+   echo "Sorry, /usr/share/grml/effect.ogg of package grml-files not available.">&2
+   exit 1
 fi
 
 echo "$PN - trying to play $FILE with $PLAYER
@@ -21,11 +36,11 @@ You do not hear anything? Make sure volume is not turned off.
 Adjust mixer settings via aumix or alsamixer.
 
 Tip: $PN supports some options.
-Just provide the files you want to play as arguments,
+Just provide the file(s) you want to play as argument(s),
 adjust player which should be used for playing the files
 via environment variable PLAYER. Usage example:
 
-  PLAYER=mp3blaster $PN /usr/share/grml/effect.ogg /another/file/to/play.mp3
+  PLAYER=mplayer $PN /usr/share/grml/effect.ogg /another/file/to/play.mp3
 "
 
 $PLAYER $FILE && echo "It looks like sound works for you. :-)" || echo "problems with sound? :-("