Auto commit by The Sugar System.

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 85bdc4b9b7d6f321a30a9592e7abe758080b60fe..171382972cc22c884e6a0578324bacf607de7971 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -4,23 +4,23 @@ bindkey -e
 stty -ixon ixany
 stty erase '^H'
 
-setenv () { export $1="$@[2,-1]" }
-unsetenv () { unset $1 }
-
-#zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z} r:|[-_./]=* r:|=*'
 zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z} r:|[/]=* r:|=*'
 zstyle ':completion:*' use-cache true
 
-fpath=($HOME/.zfunc $fpath)
-autoload -U ~/.zfunc/*(:t)
-function r() {
-  local f
-  f=(~/.zfunc/*(.))
-  unfunction $f:t 2> /dev/null
-  autoload -U $f:t
-}
+if [ -d "$HOME/.zfunc" ]; then
+    fpath=($HOME/.zfunc $fpath)
+    autoload -U ~/.zfunc/*(:t)
+    function r() {
+        local f
+        f=(~/.zfunc/*(.))
+        unfunction $f:t 2> /dev/null
+        autoload -U $f:t
+    }
+fi
 
-_cache_hosts=(`perl -ne  'if (/^([a-zA-Z0-9.-]+)/) { print "$1\n";}' ~/.ssh/known_hosts`)
+if [ -f "$HOME/.ssh/known_hosts" ]; then
+    _cache_hosts=(`perl -ne  'if (/^([a-zA-Z0-9.-]+)/) { print "$1\n";}' ~/.ssh/known_hosts`)
+fi
 
 setopt no_beep
 setopt auto_cd
@@ -62,8 +62,6 @@ alias -g T="| tail"
 
 alias ..='cd ..'
 alias cd..='cd ..'
-alias cp='cp -i'
-alias mv='mv -i'
 alias ls='ls -wF'
 alias la='ls -wa'
 alias l='ls -wl'
@@ -71,7 +69,6 @@ alias lls='ls -wla'
 alias p='pushd'
 alias o='popd'
 alias d='dirs'
-alias top='top -X -s 7 -ocpu -Otime -F -R -t'
 alias unstuff='open -a StuffIt\ Expander.app'
 alias pa='open -a NiseRingo.app'
 alias df='df -h'
@@ -84,76 +81,28 @@ alias safari="open -a Safari"
 alias w3m="w3m -O UTF-8"
 alias w3mb="w3m -O UTF-8 -B"
 alias ldd="otool -L"
-alias cmus="cmus 2>/dev/null"
 alias heboris='open /Applications/HeborisUEMac/exe/Heboris\ OpenGL.app'
 
-function openurl {
-    `firefox -remote "openurl($1,new-tab)"`
-}
-
-function keepnice20 {
-    sudo nice -n -20 sudo -u ${USER} $@
-}
-
-alias startcow='cd ~/Applications/dnetc*; ./dnetc -shutdown; ./dnetc'
-alias pausecow='~/Applications/dnetc*/dnetc -pause'
-alias resumecow='~/Applications/dnetc*/dnetc -unpause'
-
-alias startnekoko='cd ~/development/NekokoAndShota; ./nekosho -d nekoko-ord'
-alias startshota='cd ~/development/NekokoAndShota; ./nekosho -d shota-ord'
-
-alias startbottle='cd ~/development/bottleuploadcatcher; ./catcher'
-
-#alias tome='open ~/Applications/ToME*/T.o.M.E.*'
 alias hengband='open ~/Applications/hengband*/Hengband*'
 
-function verbose_comp {
-    zstyle ':completion:*' verbose yes
-    zstyle ':completion:*:descriptions' format '%B%d%b'
-    zstyle ':completion:*:messages' format '%d'
-    zstyle ':completion:*:warnings' format 'No matches for: %d'
-    zstyle ':completion:*' group-name ''
-}
-verbose_comp
-
 # The following lines were added by compinstall
 
-zstyle :compinstall filename '/Users/admin/.zshrc'
+zstyle :compinstall filename "$HOME/.zshrc"
 
 autoload -U compinit
 compinit
 # End of lines added by compinstall
 
 if [ "x$WINDOW" = "x" ]; then
-    fortune
+    if which fortune 2>&1 >/dev/null; then
+        fortune
+    fi
 fi
 
 if [ -e ".motd" ]; then
     cat .motd
 fi
 
-function initscreen {
-    case "x$WINDOW" in
-       "x0")
-           top;;
-       "x1")
-           cd ~/sandbox/impfarm/client && \
-               echo "Type ./impfarm.sh to start IMP";;
-       "x2")
-           cd ~/var/futasuke;;
-       "x3")
-           cd ~/var/folding-at-home;;
-           #cd ~/var/futasuke && \
-#              echo "Type ./start.sh to start futasuke";;
-    esac
-}
-if [ "x$WINDOW" != "x" ] && [ "x$INITSCREEN" != "xdone" ]; then
-    export INITSCREEN="done"
-    initscreen
+if which ssh-agent-manager 2>&1 >/dev/null; then
+    eval `ssh-agent-manager -s`
 fi
-
-#if [ "$DISPLAY" = "" ]; then
-#    export DISPLAY=":0.0"
-#fi
-
-eval `ssh-agent-manager -s`