the colorize option for ls is different on linux and darwin

pull/2/head
Bodaniel Jeanes 2009-04-26 17:02:57 +10:00
parent a5a644a072
commit 7bf0ff8c02
3 changed files with 7 additions and 3 deletions

View File

@ -46,7 +46,7 @@ if [ $system_name == 'Darwin' ]; then
x4="$(/usr/bin/arch)" x4="$(/usr/bin/arch)"
echo "${x1} - ${x2} - ${x3} - ${x4}" echo "${x1} - ${x2} - ${x3} - ${x4}"
} }
alias ls='ls -G'
alias m='mate .' alias m='mate .'
alias et="m" alias et="m"
alias o='open .' alias o='open .'
@ -55,4 +55,6 @@ if [ $system_name == 'Darwin' ]; then
alias showfile='/usr/bin/SetFile -a "v"' alias showfile='/usr/bin/SetFile -a "v"'
alias startpg='sudo /Library/StartupItems/PostgreSQL/PostgreSQL start' alias startpg='sudo /Library/StartupItems/PostgreSQL/PostgreSQL start'
alias readrails="mate `ruby -rubygems -e "puts( ['rails', 'activerecord', 'activeresource', 'actionpack', 'activesupport'].collect { |gem| gems = Gem.source_index.find_name(gem); gems.last.full_gem_path; }.join(' '))"`" alias readrails="mate `ruby -rubygems -e "puts( ['rails', 'activerecord', 'activeresource', 'actionpack', 'activesupport'].collect { |gem| gems = Gem.source_index.find_name(gem); gems.last.full_gem_path; }.join(' '))"`"
else
alias ls='ls --color=auto'
fi fi

4
bashrc
View File

@ -8,6 +8,10 @@ source ~/.save-directory
if [ $system_name == 'Darwin' ]; then if [ $system_name == 'Darwin' ]; then
source ~/.gemdoc source ~/.gemdoc
source ~/.terminal source ~/.terminal
else
if [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi fi
export PS1='$(__git_ps1 "\[${COLOR_RED}\](%s)\[${COLOR_NC}\] ")\$ ' export PS1='$(__git_ps1 "\[${COLOR_RED}\](%s)\[${COLOR_NC}\] ")\$ '

View File

@ -40,8 +40,6 @@ export CLICOLOR=1
# sets title of window to be user@host # sets title of window to be user@host
export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}"; echo -ne "\007"' export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}"; echo -ne "\007"'
export BASH_COMPLETION='~/.bash_completion'
# export HISTCONTROL=erasedups # I actually want duplicates because of profileme # export HISTCONTROL=erasedups # I actually want duplicates because of profileme
export HISTSIZE=1000000 export HISTSIZE=1000000