storm/talking-clock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trimmed some code that is no longer needed.

Browse Source
This commit is contained in:
Storm dragon
2016-01-28 18:18:33 -05:00
parent 9b63b3da42
commit 152f9b3628
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/talking-clock
View File

@@ -272,7 +272,10 @@ soundCommand="${sound:-play -qV0}"
voice="${voice:-espeak -v en-us -a 150}" voice="${voice:-espeak -v en-us -a 150}"
#should the time be spoken? #should the time be spoken?
speakTime="${speak:-true}" speakTime="${speak:-true}"
# Load soundpack.
soundPack="${soundpack:-/usr/share/talking-clock}" soundPack="${soundpack:-/usr/share/talking-clock}"
# Time format
format="${format:-12}"
#Get and process commandline args which override all other settings. #Get and process commandline args which override all other settings.
while [ $# -gt 0 ] ; do while [ $# -gt 0 ] ; do
@@ -337,11 +340,9 @@ if [ "$speakTime" == "true" ] ; then
timeString="$(number_to_text $hour) $(number_to_text $minute) $timeOfDay" timeString="$(number_to_text $hour) $(number_to_text $minute) $timeOfDay"
fi fi
#if 24 time is set, override the above with correct settings. #if 24 time is set, override the above with correct settings.
if [ -n "$format" ] ; then if [ "$format" = "24" ] ; then
#Make it read purdy for speech synthesizers. #Make it read purdy for speech synthesizers.
timeString="$(date +'%H:%M' | sed -e 's/^00:00$/zero hundred hours/' -e 's/:00$/ hundred hours/' -e 's/:0/ o /' -e 's/^0//')" timeString="$(date +'%H:%M' | sed -e 's/^00:00$/zero hundred hours/' -e 's/:00$/ hundred hours/' -e 's/:0/ o /' -e 's/^0//')"
else
timeString="$(echo "$timeString" | sed -e 's/^0//' -e 's/^10/ten/' -e 's/^11/eleven/' -e 's/^12/twelve/')"
fi fi
#Add temperature if zipcode is set #Add temperature if zipcode is set
if [ -n "$zipcode" ] ; then if [ -n "$zipcode" ] ; then