Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshrc

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index d6cc9e00811ffb609d69583f1656b65e1eb0e270..0bd22e73f0af27ac4c64da5dde09c29a4140f86c 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -53,7 +53,11 @@ setopt inc_append_history
 setopt share_history
 
 function _we_are_in_gnu_screen () {
-    [[ "$WINDOW" != "" ]]
+    [[ -n "$WINDOW" ]]
+}
+
+function _we_are_in_ssh_session () {
+    [[ -n "$SSH_CONNECTION" ]]
 }
 
 _prompt_base='%B[%n@%m] %{%(?.$fg[green].$fg[red])%}%#%{$reset_color%}%b '
@@ -95,7 +99,7 @@ function print_directory_info() {
 
     elif [[ -r $absdir/.hg/branch ]] then
         # Hg
-       local hgbranch=`cat $absdir/.hg/branch`
+        local hgbranch=`cat $absdir/.hg/branch`
         if [[ -e $absdir/.hg/unpushed ]] then
             echo "*${hgbranch}*"
         else
@@ -131,6 +135,7 @@ alias -g L="| $PAGER"
 alias -g G="| grep"
 alias -g H="| head"
 alias -g T="| tail"
+alias -g X="| hexdump -C"
 
 alias ..='cd ..'
 alias cd..='cd ..'
@@ -159,12 +164,12 @@ alias g2="ssh pho@g2.cuenote.jp"
 alias mana="ssh pho@mana"
 
 if [ $(hostname) = "aria.cielonegro.org" ]; then
-    alias firefox="/opt/local/bin/firefox"
     alias safari="open -a Safari"
     alias unstuff='open -a StuffIt\ Expander.app'
     alias pa='open -a NiseRingo.app'
     alias heboris='open /Applications/HeborisUEMac/exe/Heboris\ OpenGL.app'
     alias hengband='open ~/Applications/hengband*/Hengband*'
+    alias syssleep='sudo shutdown -s now'
 fi
 
 if [ $(uname) = "Darwin" ]; then
@@ -191,16 +196,24 @@ autoload -U compinit
 compinit
 # End of lines added by compinstall
 
-if [ "x$WINDOW" = "x" ]; then
+if ( _we_are_in_gnu_screen ); then
+    # When we are in a GNU Screen session...
+
+    if ( _we_are_in_ssh_session ); then
+        # Propagate remote session's bells to the local one.
+        screen -X vbell off
+    fi
+else
+    if [ -e ".motd" ]; then
+        cat ".motd"
+    fi
+
+    # Run "fortune" if we aren't in a GNU Screen session.
     if which fortune 2>&1 >/dev/null; then
         fortune
     fi
 fi
 
-if [ -e ".motd" ]; then
-    cat .motd
-fi
-
 if which ssh-agent-manager 2>&1 >/dev/null; then
     eval `ssh-agent-manager -s`
 fi