Add ls colors.

This commit is contained in:
Ivan Malison 2014-04-08 05:50:21 -07:00
parent 1afd13b94f
commit 30b45038eb
3 changed files with 22 additions and 10 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
case `uname` in case `uname` in
'Darwin') 'Darwin')
readlink_command='greadlink' readlink_command='greadlink'
@ -6,29 +6,31 @@ case `uname` in
*) *)
readlink_command='readlink' readlink_command='readlink'
esac esac
DOTFILES_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs "${readlink_command}" -f)/dotfiles"
CURRENT_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs "${readlink_command}" -f)/dotfiles"
cd $CURRENT_DIRECTORY
echo "Linking From $CURRENT_DIRECTORY"
function symlink_dotfiles() { function symlink_dotfiles() {
[[ -a ~/.dotfiles-backups ]] || mkdir ~/.dotfiles-backups cd $DOTFILES_DIRECTORY
[[ -a ~/.dotfiles-backups ]] && mv ~/.dotfiles-backups ~/.dotfiles-backups.old
mkdir ~/.dotfiles-backups
for filename in *; do for filename in *; do
local link_destination="$HOME/.$filename" local link_destination="$HOME/.$filename"
local absolute_path="$($readlink_command -f $filename)" local absolute_path="$($readlink_command -f $filename)"
echo "linking $link_destination to $absolute_path"
[[ -a $link_destination ]] && mv $link_destination ~/.dotfiles-backups [[ -a $link_destination ]] && mv $link_destination ~/.dotfiles-backups
ln -si $absolute_path $link_destination ln -si $absolute_path $link_destination
done done
[[ -a ~/.dotfiles-backups ]] && mv ~/.dotfiles-backups.old ~/.dotfiles-backups/.dotfiles-backups
} }
if [ "$1" == "--force" -o "$1" == "-f" ]; then if [ "$1" == "--force" -o "$1" == "-f" ]; then
doIt symlink_dotfiles
else else
read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1 read -p "Symlinking files from $DOTFILES_DIRECTORY. This may overwrite existing files in your home directory. Do you wish to proceed? (y/n) " -n 1
echo echo
if [[ $REPLY =~ ^[Yy]$ ]]; then if [[ $REPLY =~ ^[Yy]$ ]]; then
symlink_dotfiles symlink_dotfiles
fi fi
fi fi
unset symlink_dotfiles unset symlink_dotfiles
unset DOTFILES_DIRECTORY

View File

@ -5,6 +5,14 @@ alias emacs="emacsclient -t"
# enables the sudoing of aliases. # enables the sudoing of aliases.
alias sudo='sudo ' alias sudo='sudo '
# Detect which `ls` flavor is in use
if ls --color > /dev/null 2>&1; then # GNU `ls`
colorflag="--color"
else # OS X `ls`
colorflag="-G"
fi
alias ls="command ls ${colorflag}"
# IP addresses # IP addresses
alias ip="dig +short myip.opendns.com @resolver1.opendns.com" alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
alias localip="ifconfig getifaddr en1" alias localip="ifconfig getifaddr en1"

View File

@ -18,4 +18,6 @@ export LC_ALL="en_US.UTF-8"
export LESS_TERMCAP_md="$ORANGE" export LESS_TERMCAP_md="$ORANGE"
# Dont clear the screen after quitting a manual page # Dont clear the screen after quitting a manual page
export MANPAGER="less -X" export MANPAGER="less -X"
export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:'