More elegant (and robust) check for program availability.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14311 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 16 insertions, 16 deletions

diff --git a/tools/configure b/tools/configure
index 041c7d3f8d..0bbb9584a7 100755
--- a/tools/configure
+++ b/tools/configure
@@ -327,7 +327,7 @@ voiceconfig () {
     echo "Building $thislang voice for $archos. Select options"
     echo ""
 
-    if [ "`which flite`" != "" ]; then
+    if [ -f "`which flite`" ]; then
         FLITE="F(l)ite "
         FLITE_OPTS="FLITE_OPTS=\"\""
         DEFAULT_TTS="flite"
@@ -335,7 +335,7 @@ voiceconfig () {
         DEFAULT_NOISEFLOOR="500"
         DEFAULT_CHOICE="L"
     fi
-    if [ "`which espeak`" != "" ]; then
+    if [ -f "`which espeak`" ]; then
         ESPEAK="(e)Speak "
         ESPEAK_OPTS="ESPEAK_OPTS=\"\""
         DEFAULT_TTS="espeak"
@@ -343,7 +343,7 @@ voiceconfig () {
         DEFAULT_NOISEFLOOR="500"
         DEFAULT_CHOICE="e"
     fi
-    if [ "`which festival`" != "" ]; then
+    if [ -f "`which festival`" ]; then
         FESTIVAL="(F)estival "
         FESTIVAL_OPTS="FESTIVAL_OPTS=\"\""
         DEFAULT_TTS="festival"
@@ -352,7 +352,7 @@ voiceconfig () {
         DEFAULT_CHOICE="F"
     fi
     # Allow SAPI if Windows is in use
-    if [ "`which winver`" != "" ]; then
+    if [ -f "`which winver`" ]; then
         SAPI5="(S)API5 "
         SAPI5_OPTS="SAPI5_OPTS=\"\""
         DEFAULT_TTS="sapi5"
@@ -405,21 +405,21 @@ voiceconfig () {
 
     echo ""
 
-    if [ "`which oggenc`" != "" ]; then
+    if [ -f "`which oggenc`" ]; then
         OGGENC="(O)ggenc "
         DEFAULT_ENC="oggenc"
         VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\""
         DEFAULT_ENC_OPTS=$VORBIS_OPTS
         DEFAULT_CHOICE="O"
     fi
-    if [ "`which speexenc`" != "" ]; then
+    if [ -f "`which speexenc`" ]; then
         SPEEXENC="(S)peexenc "
         DEFAULT_ENC="speexenc"
         SPEEX_OPTS="" # TODO: find appropriate options for speex
         DEFAULT_ENC_OPTS=$SPEEX_OPTS
         DEFAULT_CHOICE="S"
     fi
-    if [ "`which lame`" != "" ]; then
+    if [ -f "`which lame`" ]; then
         LAME="(L)ame "
         DEFAULT_ENC="lame"
         LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\""
@@ -463,7 +463,7 @@ voiceconfig () {
     fi
 
     TEMPDIR="${pwd}"
-    if [ "`which cygpath`" != "" ]; then
+    if [ -f "`which cygpath`" ]; then
         TEMPDIR=`cygpath . -a -w`
     fi
 
diff --git a/tools/voicecommon.sh b/tools/voicecommon.sh
index 61e0d07bdd..052e73b67a 100644
--- a/tools/voicecommon.sh
+++ b/tools/voicecommon.sh
@@ -53,7 +53,7 @@ TOOLSDIR=`dirname $0`
 WAVTRIM=$TOOLSDIR/wavtrim
 
 # The SAPI5 script directory
-if [ "`which cygpath`" != "" ]; then
+if [ -f "`which cygpath`" ]; then
     SAPI5DIR=`cygpath $TOOLSDIR -a -w`
 fi
 
@@ -128,14 +128,14 @@ init_tts() {
     case $TTS_ENGINE in
         festival)
             # Check for festival_client
-            if [ "`which $FESTIVAL_CLIENT`" = "" ]; then
+            if [ -f "`which $FESTIVAL_CLIENT`" ]; then
                 echo "Error: $FESTIVAL_CLIENT not found"
                 exit 4
             fi
 
             # Check for, and start festival server if specified
             if [ X$FESTIVAL_START = XY ]; then
-                if [ "`which $FESTIVAL_BIN`" = "" ]; then
+                if [ -f "`which $FESTIVAL_BIN`" ]; then
                     echo "Error: $FESTIVAL_BIN not found"
                     exit 3
                 fi
@@ -160,14 +160,14 @@ init_tts() {
             ;;
         flite)
             # Check for flite
-            if [ "`which $FLITE_BIN`" = "" ]; then
+            if [ -f "`which $FLITE_BIN`" ]; then
                 echo "Error: $FLITE_BIN not found"
                 exit 5
             fi
             ;;
         espeak)
             # Check for espeak
-            if [ "`which $ESPEAK_BIN`" = "" ]; then
+            if [ -f "`which $ESPEAK_BIN`" ]; then
                 echo "Error: $ESPEAK_BIN not found"
                 exit 5
             fi
@@ -208,21 +208,21 @@ init_encoder() {
     case $ENCODER in
         lame)
             # Check for lame binary
-            if [ "" = "`which $LAME_BIN`" ]; then
+            if [ -f "`which $LAME_BIN`" ]; then
                 echo "Error: $LAME_BIN not found"
                 exit 6
             fi
             ;;
         speex)
             # Check for speexenc binary
-            if [ "" = "`which $SPEEX_BIN`" ]; then
+            if [ -f "`which $SPEEX_BIN`" ]; then
                 echo "Error: $SPEEX_BIN not found"
                 exit 7
             fi
             ;;
         vorbis)
             # Check for vorbis encoder binary
-            if [ "" = "`which $VORBIS_BIN`" ]; then
+            if [ -f "`which $VORBIS_BIN`" ]; then
                 echo "Error: $VORBIS_BIN not found"
                 exit 10
             fi