From 56a771c6f6915d706a3b767e9bace6b79c98e387 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Mon, 18 Nov 2013 14:27:52 +0900 Subject: [PATCH] update zsh related code --- shrc | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/shrc b/shrc index 749dc01..2955c72 100755 --- a/shrc +++ b/shrc @@ -80,8 +80,8 @@ install -d "$__homevar" alias isinteractive=false __match "$-" i >/dev/null && alias isinteractive=true -alias issourced=true -expr "$0" : "^.*shrc$" >/dev/null && alias issourced=false # executed +# alias issourced=true +# expr "$0" : "^.*shrc$" >/dev/null && alias issourced=false # executed # Basic idea is: if PATH value is destroyed set again. alias __firstload=false @@ -102,6 +102,15 @@ then __safe_add_path_r "/c/mingw/bin" __safe_add_path_r "/c/mingw/msys/1.0/bin" + isdarwin && { + # macports coreutils + __safe_add_path_l "/opt/local/bin" + __safe_add_path_l "/opt/local/sbin" + __safe_add_path_l "/opt/local/libexec/gnubin" + __safe_add_path_l \ + "/opt/local/Library/Frameworks/Python.framework/Versions/3.2/bin" + } + test -f "${__dotdir}/rc.py" && export PYTHONSTARTUP="${__dotdir}/rc.py" install -d "$HOME/.local/lib/python/site-packages" @@ -216,7 +225,7 @@ fi ####################### # If not running interactively, don't do anything -issourced || exit +# issourced || exit isinteractive || return ###################### @@ -918,10 +927,12 @@ dpaste(){ if inzsh then # http://zsh.sourceforge.net/Guide/zshguide06.html#l147 - autoload -U compinit; compinit + autoload compinit; compinit unsetopt auto_menu setopt bash_auto_list bindkey -e + autoload colors; colors + zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} fi ######################################