X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=146a5bd90f212d04f5f395499f7021db2356b738;hb=91e66592c4348014dda162477eb7116c45a2326e;hp=f5088f69b3e62a049c3bf0e84c5fab87fae4115a;hpb=fb6dc41fca192a4c88330c11ead8f958e9c92de7;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index f5088f6..146a5bd 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1496,28 +1496,6 @@ iso2utf() {
     fi
 }
 
-# set up software synthesizer via speakup
-swspeak() {
-    if [ -x /usr/sbin/swspeak-setup ] ; then
-       setopt singlelinezle
-       unsetopt prompt_cr
-       export PS1="%m%# "
-       /usr/sbin/swspeak-setup $@
-     else # old version:
-        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
 check_com 0 || alias 0='return 0'
 
@@ -1670,9 +1648,9 @@ if [[ -r /etc/debian_version ]] ; then
 fi
 
 # sort installed Debian-packages by size
-if check_com -c grep-status ; then
+if check_com -c dpkg-query ; then
     #a3# List installed Debian-packages sorted by size
-    alias debs-by-size='grep-status -FStatus -sInstalled-Size,Package -n "install ok installed" | paste -sd "  \n" | sort -rn'
+    alias debs-by-size="dpkg-query -Wf 'x \${Installed-Size} \${Package} \${Status}\n' | sed -ne '/^x  /d' -e '/^x \(.*\) install ok installed$/s//\1/p' | sort -nr"
 fi
 
 # if cdrecord is a symlink (to wodim) or isn't present at all warn:
@@ -2278,17 +2256,6 @@ peval() {
 }
 functions peval &>/dev/null && alias calc=peval
 
-# brltty seems to have problems with utf8 environment and/or font Uni3-Terminus16 under
-# certain circumstances, so work around it, no matter which environment we have
-brltty() {
-    if [[ -z "$DISPLAY" ]] ; then
-        consolechars -f /usr/share/consolefonts/default8x16.psf.gz
-        command brltty "$@"
-    else
-        command brltty "$@"
-    fi
-}
-
 # just press 'asdf' keys to toggle between dvorak and us keyboard layout
 aoeu() {
     echo -n 'Switching to us keyboard layout: '
@@ -3470,53 +3437,6 @@ allulimit() {
     ulimit -t unlimited
 }
 
-# 2mp3 transcodes flac and ogg to mp3 with bitrate of 192 while preserving basic tags
-if check_com lame; then
-    2mp3_192() {
-        emulate -L zsh
-        setopt extendedglob
-        unsetopt ksharrays
-
-        local -a DECODE id3tags
-        local -A tagmap
-        local tagdata
-        local RC=0
-        tagmap=("(#l)title" --tt "(#l)artist" --ta "(#l)tracknumber" --tn "(#l)genre" --tg "(#l)album" --tl)
-
-        if [[ ${@[(i)*.ogg]} -le ${#@} ]] && ! check_com oggdec; then
-            echo "ERROR: please install oggdec" >&2
-            return 1
-        fi
-        if [[ ${@[(i)*.flac]} -le ${#@} ]] && ! check_com flac; then
-            echo "ERROR: please install flac" >&2
-            return 1
-        fi
-
-        for af in "$@"; do
-            id3tags=()
-            case "$af" in
-                (*.flac)
-                    DECODE=(flac -d -c "$af")
-                    tagdata="$(metaflac --export-tags-to=- "$af")"
-                    ;;
-                (*.ogg)
-                    DECODE=(oggdec -Q -o - "$af")
-                    tagdata="$(ogginfo "$af")"
-                    ;;
-                (*) continue ;;
-            esac
-            for line (${(f)tagdata}) \
-                [[ "$line" == (#s)[[:space:]]#(#b)([^=]##)=(*)(#e) && -n $tagmap[(k)$match[1]] ]] && \
-                id3tags+=($tagmap[(k)$match[1]] "$match[2]")
-            [[ ${#id3tags} -gt 0 ]] && id3tags=(--add-id3v2 --ignore-tag-errors $id3tags)
-            $DECODE[*] | lame -b 192 -v -h --replaygain-fast  "${id3tags[@]}" - "${af:r}.mp3" || {RC=$?; print "Error transcoding" "${af}"; }
-        done
-        # return 0 if no error or exit code if at least one error happened
-        return $RC
-    }
-    alias ogg2mp3_192 2mp3_192
-fi
-
 #f5# RFC 2396 URL encoding in Z-Shell
 urlencode() {
     emulate -L zsh
@@ -3638,9 +3558,9 @@ if check_com -c highlight ; then
                 lang=${1%:*}
                 [[ ${1} == *:* ]] && [[ -n ${1#*:} ]] && theme=${1#*:}
                 if [[ -n ${theme} ]] ; then
-                    highlight --xterm256 --syntax ${lang} --style ${theme} ${2} | less -SMr
+                    highlight -O xterm256 --syntax ${lang} --style ${theme} ${2} | less -SMr
                 else
-                    highlight --ansi --syntax ${lang} ${2} | less -SMr
+                    highlight -O ansi --syntax ${lang} ${2} | less -SMr
                 fi
                 ;;
         esac