src/tk/makefile: Micropolis build fixes for recent macOS

[micropolis] / res / sounds / player

diff --git a/res/sounds/player b/res/sounds/player
index 7784940d8eb5ef608f5b49d87dabef459f2673be..48e05d7e07f61330f5c454638ff8bcc20ed42295 100755 (executable)
--- a/res/sounds/player
+++ b/res/sounds/player
@@ -1,13 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
-PLAYER=true
+PLAYER=
 
-if [ -x "`which aplay`" ]; then
+if type -a aplay &>/dev/null; then
        PLAYER=aplay
-elif [ -x "`which play`" ]; then
+elif type -a afplay &>/dev/null; then
+       #afplay is shipped with OS X Leopard
+       PLAYER=afplay
+elif type -a play &>/dev/null; then
        PLAYER=play
-elif [ -x "`which mplayer`" ]; then
+elif type -a mplayer &>/dev/null; then
        PLAYER="mplayer -nogui -nocache"
 fi
 
-exec ${PLAYER} "$@" >/dev/null 2>&1
+if [ "x${PLAYER}" = "x" ]; then
+       echo "Can't find audio player!"
+       echo "Please make sure you have aplay, play or mplayer in your path."
+       if [ "`uname`" = "Darwin" ]; then
+               echo "A working play for OS X is available from:"
+               echo "http://www.hieper.nl/html/play.html"
+       fi
+else
+       exec ${PLAYER} "$@" >/dev/null 2>&1
+fi