summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJonas Häggqvist <rasher@rasher.dk>2007-08-09 22:16:10 +0000
committerJonas Häggqvist <rasher@rasher.dk>2007-08-09 22:16:10 +0000
commit2f6f52d7e424d0aaef2774437aca9474c33a88bc (patch)
tree4a0ad269707b9bde31937fbd199a668d34faaa2b /tools
parentedf54496ad7a9a5730d99f0d6ce9edc8347e1763 (diff)
downloadrockbox-2f6f52d7e424d0aaef2774437aca9474c33a88bc.tar.gz
rockbox-2f6f52d7e424d0aaef2774437aca9474c33a88bc.tar.bz2
rockbox-2f6f52d7e424d0aaef2774437aca9474c33a88bc.zip
Don't break if the program paths looked for contain spaces.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14261 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/configure16
-rw-r--r--tools/voicecommon.sh18
2 files changed, 18 insertions, 16 deletions
diff --git a/tools/configure b/tools/configure
index e01230c390..5601a9aae7 100755
--- a/tools/configure
+++ b/tools/configure
@@ -308,7 +308,7 @@ voiceconfig () {
echo "Building voice for $archos"
echo ""
- if [ `which flite` ]; then
+ if [ "`which flite`" != "" ]; then
FLITE="F(l)ite "
FLITE_OPTS="FLITE_OPTS=\"\""
DEFAULT_TTS="flite"
@@ -316,7 +316,7 @@ voiceconfig () {
DEFAULT_NOISEFLOOR="500"
DEFAULT_CHOICE="L"
fi
- if [ `which espeak` ]; then
+ if [ "`which espeak`" != "" ]; then
ESPEAK="(e)Speak "
ESPEAK_OPTS="ESPEAK_OPTS=\"\""
DEFAULT_TTS="espeak"
@@ -324,7 +324,7 @@ voiceconfig () {
DEFAULT_NOISEFLOOR="500"
DEFAULT_CHOICE="e"
fi
- if [ `which festival` ]; then
+ if [ "`which festival`" != "" ]; then
FESTIVAL="(F)estival "
FESTIVAL_OPTS="FESTIVAL_OPTS=\"\""
DEFAULT_TTS="festival"
@@ -333,7 +333,7 @@ voiceconfig () {
DEFAULT_CHOICE="F"
fi
# Allow SAPI if Windows is in use
- if [ `which winver` ]; then
+ if [ "`which winver`" != "" ]; then
SAPI5="(S)API5 "
SAPI5_OPTS="SAPI5_OPTS=\"\""
DEFAULT_TTS="sapi5"
@@ -379,21 +379,21 @@ voiceconfig () {
echo ""
- if [ `which oggenc` ]; then
+ if [ "`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 [ "`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 [ "`which lame`" != "" ]; then
LAME="(L)ame "
DEFAULT_ENC="lame"
LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\""
@@ -428,7 +428,7 @@ voiceconfig () {
# esac
echo "Using $ENCODER for encoding voice clips"
TEMPDIR="${pwd}"
- if [ `which cygpath` ]; then
+ if [ "`which cygpath`" != "" ]; then
TEMPDIR=`cygpath . -a -w`
fi
diff --git a/tools/voicecommon.sh b/tools/voicecommon.sh
index 138ff59a9e..e18308ee4e 100644
--- a/tools/voicecommon.sh
+++ b/tools/voicecommon.sh
@@ -53,7 +53,9 @@ TOOLSDIR=`dirname $0`
WAVTRIM=$TOOLSDIR/wavtrim
# The SAPI5 script directory
-SAPI5DIR=`cygpath $TOOLSDIR -a -w`
+if [ "`which cygpath`" != "" ]; then
+ SAPI5DIR=`cygpath $TOOLSDIR -a -w`
+fi
#####################
# Festival settings #
@@ -126,14 +128,14 @@ init_tts() {
case $TTS_ENGINE in
festival)
# Check for festival_client
- if [ ! `which $FESTIVAL_CLIENT` ]; then
+ if [ "`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 [ "`which $FESTIVAL_BIN`" = "" ]; then
echo "Error: $FESTIVAL_BIN not found"
exit 3
fi
@@ -158,14 +160,14 @@ init_tts() {
;;
flite)
# Check for flite
- if [ ! `which $FLITE_BIN` ]; then
+ if [ "`which $FLITE_BIN`" = "" ]; then
echo "Error: $FLITE_BIN not found"
exit 5
fi
;;
espeak)
# Check for espeak
- if [ ! `which $ESPEAK_BIN` ]; then
+ if [ "`which $ESPEAK_BIN`" = "" ]; then
echo "Error: $ESPEAK_BIN not found"
exit 5
fi
@@ -206,21 +208,21 @@ init_encoder() {
case $ENCODER in
lame)
# Check for lame binary
- if [ ! `which $LAME_BIN` ]; then
+ if [ "" = "`which $LAME_BIN`" ]; then
echo "Error: $LAME_BIN not found"
exit 6
fi
;;
speex)
# Check for speexenc binary
- if [ ! `which $SPEEX_BIN` ]; then
+ if [ "" = "`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 [ "" = "`which $VORBIS_BIN`" ]; then
echo "Error: $VORBIS_BIN not found"
exit 10
fi