zshrc: update function swspeak for new script swspeak-setup

diff --git a/debian/changelog b/debian/changelog
index c71a4be..bd901cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 grml-etc-core (0.3.59) unstable; urgency=low
 
+  [ Frank Terbeck ]
   * zshrc: set default values for NOPRECMD and friends
 
- -- Frank Terbeck <ft@grml.org>  Mon, 06 Oct 2008 18:29:30 +0200
+  [ Michael Prokop ]
+  * gitconfig: update alias 'out', fix usage of pager config,
+    add new alias 'tagme'
+  * zshrc: update function swspeak for new script swspeak-setup
+
+ -- Michael Prokop <mika@grml.org>  Sun, 02 Nov 2008 23:50:38 +0100
 
 grml-etc-core (0.3.58) unstable; urgency=low
 

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index ee859b7..54863d3 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Wed Aug 06 23:50:53 CEST 2008 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -2060,18 +2059,25 @@ iso2utf() {
 
 # set up software synthesizer via speakup
 swspeak() {
-    aumix -w 90 -v 90 -p 90 -m 90
-    if ! [[ -r /dev/softsynth ]] ; then
-        flite -o play -t "Sorry, software synthesizer not available. Did you boot with swspeak bootoption?"
-        return 1
-    else
-        setopt singlelinezle
-        unsetopt prompt_cr
-        export PS1="%m%# "
-        nice -n -20 speechd-up
-        sleep 2
-        flite -o play -t "Finished setting up software synthesizer"
-    fi
+    if [ -x /usr/sbin/swspeak-setup ] ; then
+       setopt singlelinezle
+       unsetopt prompt_cr
+       export PS1="%m%# "
+       /usr/sbin/swspeak-setup $@
+     else # old version:
+        aumix -w 90 -v 90 -p 90 -m 90
+        if ! [[ -r /dev/softsynth ]] ; then
+            flite -o play -t "Sorry, software synthesizer not available. Did you boot with swspeak bootoption?"
+            return 1
+        else
+           setopt singlelinezle
+           unsetopt prompt_cr
+           export PS1="%m%# "
+            nice -n -20 speechd-up
+            sleep 2
+            flite -o play -t "Finished setting up software synthesizer"
+        fi
+     fi
 }
 
 # I like clean prompt, so provide simple way to get that