Permalink
Browse files

Merge branch 'master' of github.com:majnemer/davesdots

  • Loading branch information...
2 parents 7cc9698 + 243f598 commit 344de12ec19fccdc28e25bc7254b614ce7c8c1dd @majnemer committed Apr 25, 2011
Showing with 3 additions and 8 deletions.
  1. +2 −3 zsh/intel
  2. +1 −5 zsh/prompt
View
5 zsh/intel
@@ -1,6 +1,5 @@
-local iccvars_path;
if [ -d "/opt/intel/Compiler" ] ; then
- iccvars_path=$(echo /opt/intel/Compiler/11.*/*/bin/iccvars.sh(On[1]))
+ local iccvars_path=$(echo /opt/intel/Compiler/11.*/*/bin/iccvars.sh(On[1]))
if [ -r $iccvars_path ] ; then
case `uname -m` in
x86_64)
@@ -16,7 +15,7 @@ if [ -d "/opt/intel/Compiler" ] ; then
fi
elif [ -d "/opt/intel" ] ; then
if [ -e "/opt/intel/bin/compilervars.sh" ] ; then
- iccvars_path="/opt/intel/bin/compilervars.sh"
+ local iccvars_path="/opt/intel/bin/compilervars.sh"
case `uname -m` in
x86_64)
. $iccvars_path intel64
View
6 zsh/prompt
@@ -18,11 +18,7 @@ case "${TERM}" in
BOLDERRORCOLOR=$'%{\e[01;38;5;9m%}'
CLOCKCOLOR=$'%{\e[01;38;5;221m%}'
JOBCOLOR=$'%{\e[38;5;30m%}'
- if [ "${TERM_PROGRAM}" = "Apple_Terminal" ] ; then
- BLACKCOLOR=$'%{\e[00;30m%}'
- else
- BLACKCOLOR=$'%{\e[38;5;232m%}'
- fi
+ BLACKCOLOR=$'%{\e[38;5;232m%}'
;;
dumb)
;;

0 comments on commit 344de12

Please sign in to comment.