From 448eebed44c5ad2021dedc4827790a8a565de1bb Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 30 Sep 2013 22:21:02 -0700 Subject: [PATCH] Added greadlink stuff. --- .aliases | 31 +------------------------------ .brew | 2 ++ .gitconfig | 5 ++++- bootstrap.sh | 10 +++++++++- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/.aliases b/.aliases index adff61d8..7fb46897 100644 --- a/.aliases +++ b/.aliases @@ -1,25 +1,8 @@ -# Easier navigation: .., ..., ...., ....., ~ and - -alias ..="cd .." -alias ...="cd ../.." -alias ....="cd ../../.." -alias .....="cd ../../../.." -alias ~="cd ~" # `cd` is probably faster to type though -alias -- -="cd -" - -# Shortcuts -alias d="cd ~/Documents/Dropbox" -alias dl="cd ~/Downloads" -alias dt="cd ~/Desktop" -alias p="cd ~/Projects" alias g="git" alias h="history" alias j="jobs" alias emacs="emacsclient -t" -alias e="emacs" -alias m="mate ." -alias s="subl ." -alias o="open" -alias oo="open ." +alias readlink="greadlink" # Detect which `ls` flavor is in use if ls --color > /dev/null 2>&1; then # GNU `ls` @@ -28,15 +11,6 @@ else # OS X `ls` colorflag="-G" fi -# List all files colorized in long format -alias l="ls -l ${colorflag}" - -# List all files colorized in long format, including dot files -alias la="ls -la ${colorflag}" - -# List only directories -alias lsd='ls -l ${colorflag} | grep "^d"' - # Always use color output for `ls` alias ls="command ls ${colorflag}" 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:' @@ -47,9 +21,6 @@ alias sudo='sudo ' # Gzip-enabled `curl` alias gurl="curl --compressed" -# Get OS X Software Updates, and update installed Ruby gems, Homebrew, npm, and their installed packages -alias update='sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup; npm update npm -g; npm update -g; sudo gem update' - # IP addresses alias ip="dig +short myip.opendns.com @resolver1.opendns.com" alias localip="ipconfig getifaddr en1" diff --git a/.brew b/.brew index e3f2c02c..90430ac1 100755 --- a/.brew +++ b/.brew @@ -14,6 +14,8 @@ brew install findutils # Install Bash 4 brew install bash +brew install greadlink + # Install wget with IRI support brew install wget --enable-iri diff --git a/.gitconfig b/.gitconfig index c2edc63c..340d0a34 100644 --- a/.gitconfig +++ b/.gitconfig @@ -69,4 +69,7 @@ pushInsteadOf = "gist:" pushInsteadOf = "git://gist.github.com/" [url "git://gist.github.com/"] - insteadOf = "gist:" \ No newline at end of file + insteadOf = "gist:" +[user] + email = IvanMalison@gmail.com + name = Ivan Malison diff --git a/bootstrap.sh b/bootstrap.sh index 710017f6..6a9bfaef 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,13 @@ #!/bin/bash -CURRENT_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs readlink -f)" +case `uname` in + 'Darwin') + readlink_command='greadlink' + ;; + *) + readlink_command='readlink' +esac + +CURRENT_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs "${readlink_command}" -f)" cd $CURRENT_DIRECTORY echo "Linking From $CURRENT_DIRECTORY"