etc/skel/.zshrc: remove duplicate cl() definition

[grml-etc-core.git] / etc / skel / .zshrc

diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc
index dbadf3c..28b878b 100644 (file)
--- a/etc/skel/.zshrc
+++ b/etc/skel/.zshrc
@@ -3,7 +3,7 @@
 # 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: Son Dez 17 14:50:06 CET 2006 [mika]
+# Latest change: Son Mär 11 12:44:51 CET 2007 [mika]
 ################################################################################
 
 # source ~/.zshrc.global {{{
@@ -35,9 +35,9 @@
 # set default browser
   if [ -z "$BROWSER" ] ; then
      if [ -n "$DISPLAY" ] ; then
-        [ -x =firefox ] && export BROWSER=firefox
+        [ -x $(which firefox) ] && export BROWSER=firefox
      else
-        [ -x =w3m ] && export BROWSER=w3m
+        [ -x $(which w3m) ] && export BROWSER=w3m
      fi
   fi
   (( ${+PAGER} ))   || export PAGER="less"
@@ -166,6 +166,19 @@
 
 # check whether Debian's package management (dpkg) is running
   alias check_dpkg_running="$SUDO dpkg_running"
+
+# work around non utf8 capable software in utf environment
+  if [ -x /usr/bin/mrxvt ] ; then
+     isutfenv && [ -n "$LANG" ] && alias mrxvt="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} mrxvt"
+  fi
+
+  if [ -x /usr/bin/aterm ] ; then
+     isutfenv && [ -n "$LANG" ] && alias aterm="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} aterm"
+  fi
+
+  if [ -x /usr/bin/centericq ] ; then
+     isutfenv && [ -n "$LANG" ] && alias centericq="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} centericq"
+  fi
 # }}}
 
 ## useful functions {{{
@@ -190,6 +203,7 @@
   fir()     { firefox -a firefox -remote "openURL($1)" }
   ggogle()  { ${=BROWSER} "http://groups.google.com/groups?q=$*" }
   google()  { ${=BROWSER} "http://www.google.com/search?&num=100&q=$*" }
+  mcd()     { mkdir -p "$@"; cd "$@" } # mkdir && cd
   mdiff()   { diff -udrP "$1" "$2" > diff.`date "+%Y-%m-%d"`."$1" }
   memusage(){ ps aux | awk '{if (NR > 1) print $5; if (NR > 2) print "+"} END { print "p" }' | dc }
   mggogle() { ${=BROWSER} "http://groups.google.com/groups?selm=$*" }
@@ -208,6 +222,17 @@
 
   which google &>/dev/null && gex () { google "\"[ $1]\" $*" } # exact search at google
 
+  # download video from youtube
+  ytdl() {
+    if ! [ -n "$2" ] ; then
+       print "Usage: ydtl http://youtube.com/watch?v=.... outputfile.flv">&2
+       return 1
+    else
+       wget -O${2} "http://youtube.com/get_video?"${${${"$(wget -o/dev/null -O- "${1}" | grep -e watch_fullscreen)"}##*watch_fullscreen\?}%%\&fs=*}
+    fi
+  }
+
+
 # Function Usage: doc packagename
   doc() { cd /usr/share/doc/$1 && ls }
   _doc() { _files -W /usr/share/doc -/ }
@@ -380,12 +405,6 @@
         print -z "${cmd[$answer]#*$TAB}"
   }
 
-# mkdir && cd
-  mcd() { mkdir -p "$@"; cd "$@" }  # mkdir && cd
-
-# cd && ls
-  cl() { cd $1 && ls -a }
-
 # Use vim to convert plaintext to HTML
   2html() { vim -u NONE -n -c ':syntax on' -c ':so $VIMRUNTIME/syntax/2html.vim' -c ':wqa' $1 &>/dev/null }
 
@@ -776,7 +795,7 @@
   }
 
 # highlight important stuff in diff output, usage example: hg diff | hidiff
-  [ -x =histring ] && \
+  [ -x $(which histring) ] && \
   alias hidiff="histring -fE '^Comparing files .*|^diff .*' | histring -c yellow -fE '^\-.*' | histring -c green -fE '^\+.*'"
 
 # rename pictures based on information found in exif headers