diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-09 22:16:10 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-09 22:16:10 +0000 |
commit | 2f6f52d7e424d0aaef2774437aca9474c33a88bc (patch) | |
tree | 4a0ad269707b9bde31937fbd199a668d34faaa2b | |
parent | edf54496ad7a9a5730d99f0d6ce9edc8347e1763 (diff) | |
download | rockbox-2f6f52d7e424d0aaef2774437aca9474c33a88bc.tar.gz 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
-rwxr-xr-x | tools/configure | 16 | ||||
-rw-r--r-- | tools/voicecommon.sh | 18 |
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 () { | |||
308 | echo "Building voice for $archos" | 308 | echo "Building voice for $archos" |
309 | echo "" | 309 | echo "" |
310 | 310 | ||
311 | if [ `which flite` ]; then | 311 | if [ "`which flite`" != "" ]; then |
312 | FLITE="F(l)ite " | 312 | FLITE="F(l)ite " |
313 | FLITE_OPTS="FLITE_OPTS=\"\"" | 313 | FLITE_OPTS="FLITE_OPTS=\"\"" |
314 | DEFAULT_TTS="flite" | 314 | DEFAULT_TTS="flite" |
@@ -316,7 +316,7 @@ voiceconfig () { | |||
316 | DEFAULT_NOISEFLOOR="500" | 316 | DEFAULT_NOISEFLOOR="500" |
317 | DEFAULT_CHOICE="L" | 317 | DEFAULT_CHOICE="L" |
318 | fi | 318 | fi |
319 | if [ `which espeak` ]; then | 319 | if [ "`which espeak`" != "" ]; then |
320 | ESPEAK="(e)Speak " | 320 | ESPEAK="(e)Speak " |
321 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" | 321 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" |
322 | DEFAULT_TTS="espeak" | 322 | DEFAULT_TTS="espeak" |
@@ -324,7 +324,7 @@ voiceconfig () { | |||
324 | DEFAULT_NOISEFLOOR="500" | 324 | DEFAULT_NOISEFLOOR="500" |
325 | DEFAULT_CHOICE="e" | 325 | DEFAULT_CHOICE="e" |
326 | fi | 326 | fi |
327 | if [ `which festival` ]; then | 327 | if [ "`which festival`" != "" ]; then |
328 | FESTIVAL="(F)estival " | 328 | FESTIVAL="(F)estival " |
329 | FESTIVAL_OPTS="FESTIVAL_OPTS=\"\"" | 329 | FESTIVAL_OPTS="FESTIVAL_OPTS=\"\"" |
330 | DEFAULT_TTS="festival" | 330 | DEFAULT_TTS="festival" |
@@ -333,7 +333,7 @@ voiceconfig () { | |||
333 | DEFAULT_CHOICE="F" | 333 | DEFAULT_CHOICE="F" |
334 | fi | 334 | fi |
335 | # Allow SAPI if Windows is in use | 335 | # Allow SAPI if Windows is in use |
336 | if [ `which winver` ]; then | 336 | if [ "`which winver`" != "" ]; then |
337 | SAPI5="(S)API5 " | 337 | SAPI5="(S)API5 " |
338 | SAPI5_OPTS="SAPI5_OPTS=\"\"" | 338 | SAPI5_OPTS="SAPI5_OPTS=\"\"" |
339 | DEFAULT_TTS="sapi5" | 339 | DEFAULT_TTS="sapi5" |
@@ -379,21 +379,21 @@ voiceconfig () { | |||
379 | 379 | ||
380 | echo "" | 380 | echo "" |
381 | 381 | ||
382 | if [ `which oggenc` ]; then | 382 | if [ "`which oggenc`" != "" ]; then |
383 | OGGENC="(O)ggenc " | 383 | OGGENC="(O)ggenc " |
384 | DEFAULT_ENC="oggenc" | 384 | DEFAULT_ENC="oggenc" |
385 | VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\"" | 385 | VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\"" |
386 | DEFAULT_ENC_OPTS=$VORBIS_OPTS | 386 | DEFAULT_ENC_OPTS=$VORBIS_OPTS |
387 | DEFAULT_CHOICE="O" | 387 | DEFAULT_CHOICE="O" |
388 | fi | 388 | fi |
389 | if [ `which speexenc` ]; then | 389 | if [ "`which speexenc`" != "" ]; then |
390 | SPEEXENC="(S)peexenc " | 390 | SPEEXENC="(S)peexenc " |
391 | DEFAULT_ENC="speexenc" | 391 | DEFAULT_ENC="speexenc" |
392 | SPEEX_OPTS="" # TODO: find appropriate options for speex | 392 | SPEEX_OPTS="" # TODO: find appropriate options for speex |
393 | DEFAULT_ENC_OPTS=$SPEEX_OPTS | 393 | DEFAULT_ENC_OPTS=$SPEEX_OPTS |
394 | DEFAULT_CHOICE="S" | 394 | DEFAULT_CHOICE="S" |
395 | fi | 395 | fi |
396 | if [ `which lame` ]; then | 396 | if [ "`which lame`" != "" ]; then |
397 | LAME="(L)ame " | 397 | LAME="(L)ame " |
398 | DEFAULT_ENC="lame" | 398 | DEFAULT_ENC="lame" |
399 | LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\"" | 399 | LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\"" |
@@ -428,7 +428,7 @@ voiceconfig () { | |||
428 | # esac | 428 | # esac |
429 | echo "Using $ENCODER for encoding voice clips" | 429 | echo "Using $ENCODER for encoding voice clips" |
430 | TEMPDIR="${pwd}" | 430 | TEMPDIR="${pwd}" |
431 | if [ `which cygpath` ]; then | 431 | if [ "`which cygpath`" != "" ]; then |
432 | TEMPDIR=`cygpath . -a -w` | 432 | TEMPDIR=`cygpath . -a -w` |
433 | fi | 433 | fi |
434 | 434 | ||
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` | |||
53 | WAVTRIM=$TOOLSDIR/wavtrim | 53 | WAVTRIM=$TOOLSDIR/wavtrim |
54 | 54 | ||
55 | # The SAPI5 script directory | 55 | # The SAPI5 script directory |
56 | SAPI5DIR=`cygpath $TOOLSDIR -a -w` | 56 | if [ "`which cygpath`" != "" ]; then |
57 | SAPI5DIR=`cygpath $TOOLSDIR -a -w` | ||
58 | fi | ||
57 | 59 | ||
58 | ##################### | 60 | ##################### |
59 | # Festival settings # | 61 | # Festival settings # |
@@ -126,14 +128,14 @@ init_tts() { | |||
126 | case $TTS_ENGINE in | 128 | case $TTS_ENGINE in |
127 | festival) | 129 | festival) |
128 | # Check for festival_client | 130 | # Check for festival_client |
129 | if [ ! `which $FESTIVAL_CLIENT` ]; then | 131 | if [ "`which $FESTIVAL_CLIENT`" = "" ]; then |
130 | echo "Error: $FESTIVAL_CLIENT not found" | 132 | echo "Error: $FESTIVAL_CLIENT not found" |
131 | exit 4 | 133 | exit 4 |
132 | fi | 134 | fi |
133 | 135 | ||
134 | # Check for, and start festival server if specified | 136 | # Check for, and start festival server if specified |
135 | if [ X$FESTIVAL_START = XY ]; then | 137 | if [ X$FESTIVAL_START = XY ]; then |
136 | if [ ! `which $FESTIVAL_BIN` ]; then | 138 | if [ "`which $FESTIVAL_BIN`" = "" ]; then |
137 | echo "Error: $FESTIVAL_BIN not found" | 139 | echo "Error: $FESTIVAL_BIN not found" |
138 | exit 3 | 140 | exit 3 |
139 | fi | 141 | fi |
@@ -158,14 +160,14 @@ init_tts() { | |||
158 | ;; | 160 | ;; |
159 | flite) | 161 | flite) |
160 | # Check for flite | 162 | # Check for flite |
161 | if [ ! `which $FLITE_BIN` ]; then | 163 | if [ "`which $FLITE_BIN`" = "" ]; then |
162 | echo "Error: $FLITE_BIN not found" | 164 | echo "Error: $FLITE_BIN not found" |
163 | exit 5 | 165 | exit 5 |
164 | fi | 166 | fi |
165 | ;; | 167 | ;; |
166 | espeak) | 168 | espeak) |
167 | # Check for espeak | 169 | # Check for espeak |
168 | if [ ! `which $ESPEAK_BIN` ]; then | 170 | if [ "`which $ESPEAK_BIN`" = "" ]; then |
169 | echo "Error: $ESPEAK_BIN not found" | 171 | echo "Error: $ESPEAK_BIN not found" |
170 | exit 5 | 172 | exit 5 |
171 | fi | 173 | fi |
@@ -206,21 +208,21 @@ init_encoder() { | |||
206 | case $ENCODER in | 208 | case $ENCODER in |
207 | lame) | 209 | lame) |
208 | # Check for lame binary | 210 | # Check for lame binary |
209 | if [ ! `which $LAME_BIN` ]; then | 211 | if [ "" = "`which $LAME_BIN`" ]; then |
210 | echo "Error: $LAME_BIN not found" | 212 | echo "Error: $LAME_BIN not found" |
211 | exit 6 | 213 | exit 6 |
212 | fi | 214 | fi |
213 | ;; | 215 | ;; |
214 | speex) | 216 | speex) |
215 | # Check for speexenc binary | 217 | # Check for speexenc binary |
216 | if [ ! `which $SPEEX_BIN` ]; then | 218 | if [ "" = "`which $SPEEX_BIN`" ]; then |
217 | echo "Error: $SPEEX_BIN not found" | 219 | echo "Error: $SPEEX_BIN not found" |
218 | exit 7 | 220 | exit 7 |
219 | fi | 221 | fi |
220 | ;; | 222 | ;; |
221 | vorbis) | 223 | vorbis) |
222 | # Check for vorbis encoder binary | 224 | # Check for vorbis encoder binary |
223 | if [ ! `which $VORBIS_BIN` ]; then | 225 | if [ "" = "`which $VORBIS_BIN`" ]; then |
224 | echo "Error: $VORBIS_BIN not found" | 226 | echo "Error: $VORBIS_BIN not found" |
225 | exit 10 | 227 | exit 10 |
226 | fi | 228 | fi |