clean up and fix EDITOR variable usage and remove unneeded-paths (since everything is now in brew etc)

pull/2/head
Bodaniel Jeanes 2010-11-22 22:28:49 +10:00
parent 75d1bd23cc
commit 7036e53742
4 changed files with 20 additions and 19 deletions

View File

@ -9,7 +9,7 @@ alias top='top -o cpu'
alias et="$EDITOR ." alias et="$EDITOR ."
alias sprof="reload" alias sprof="reload"
alias eprof="$EDITOR $HOME/.config" alias eprof="m $HOME/.config"
alias home="cd $HOME" # the tilde is too hard to reach alias home="cd $HOME" # the tilde is too hard to reach
alias systail='tail -fn0 /var/log/system.log' alias systail='tail -fn0 /var/log/system.log'
@ -34,4 +34,4 @@ alias r='rake'
alias webshare='python -c "import SimpleHTTPServer;SimpleHTTPServer.test()"' alias webshare='python -c "import SimpleHTTPServer;SimpleHTTPServer.test()"'
alias pubkey="cat $HOME/.ssh/*.pub" alias pubkey="cat $HOME/.ssh/*.pub"
alias colorslist="set | egrep 'COLOR_\w*'" # lists all the colors alias colorslist="set | egrep 'COLOR_\w*'" # lists all the colors

View File

@ -1,4 +1,4 @@
PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/git/bin:/usr/local/mongodb/bin:/usr/local/pgsql/bin:/usr/X11/bin:/opt/local/bin:${PATH}" PATH="/usr/local/bin:/usr/local/sbin:/usr/X11/bin:/usr/bin:/usr/sbin:/bin:/sbin:${PATH}"
CDPATH=".:${HOME}" CDPATH=".:${HOME}"
source $DOT_FILES/$CURRENT_SHELL/config.*sh source $DOT_FILES/$CURRENT_SHELL/config.*sh
@ -9,4 +9,4 @@ source $DOT_FILES/shell/save-directory.sh
source $DOT_FILES/shell/prompt.sh source $DOT_FILES/shell/prompt.sh
source $DOT_FILES/shell/git.sh source $DOT_FILES/shell/git.sh
[[ `uname -s` == 'Darwin' ]] && source $DOT_FILES/shell/osx.sh [[ `uname -s` == 'Darwin' ]] && source $DOT_FILES/shell/osx.sh

View File

@ -1,12 +1,18 @@
export PATH="/usr/local/mysql/bin/:$PATH" if $(which mate); then
export PATH="/opt/local/bin:/opt/local/sbin:$PATH" EDITOR="mate -wl1"
export PATH="$PATH:/usr/local/jruby/bin" elif $(which nano); then
EDITOR="nano -w"
elif $(which mvim); then
EDITOR="mvim"
elif $(which gvim); then
EDITOR="gvim"
else
EDITOR="vim"
fi
# Use single quotes here to lazy evaluate the $EDITOR variable (as it changes later if on OS X) export GEM_OPEN_EDITOR=$EDITOR
export EDITOR='nano -w' export GIT_EDITOR=$EDITOR
export GEM_OPEN_EDITOR='$EDITOR' export VISUAL=$EDITOR
export GIT_EDITOR='$EDITOR'
export VISUAL='$EDITOR'
export IRBRC="$HOME/.irbrc" export IRBRC="$HOME/.irbrc"
export JEWELER_OPTS="--rspec --gemcutter --rubyforge --reek --roodi" export JEWELER_OPTS="--rspec --gemcutter --rubyforge --reek --roodi"

View File

@ -1,9 +1,4 @@
export EDITOR='mate -wl1' CDPATH="${CDPATH}:${HOME}/Code/Mocra/:${HOME}/Code/Personal:${HOME}/Code/:${HOME}/Code/Open Source:${HOME}/Sites/Mocra:${HOME}/Sites/Personal:${HOME}/Sites/Client/"
export VISUAL=$EDITOR
export GIT_EDITOR=$EDITOR
export PATH="/Library/PostgreSQL8/bin/:$PATH"
CDPATH="${CDPATH}:${HOME}/Code/Mocra/:${HOME}/Code/Personal:${HOME}/Sites/Mocra:${HOME}/Sites/Personal:${HOME}/Sites/Client/"
alias o='open .' alias o='open .'
@ -81,4 +76,4 @@ function maxc() { printf "\e[3;0;0;t\e[8;50;0t"; /usr/bin/clear; return 0; }
function maxr() { printf "\e[3;0;0;t\e[8;0;100t"; /usr/bin/clear; return 0; } function maxr() { printf "\e[3;0;0;t\e[8;0;100t"; /usr/bin/clear; return 0; }
# show number of lines & columns # show number of lines & columns
function lc() { printf "lines: $(/usr/bin/tput lines)\ncolums: $(/usr/bin/tput cols)\n"; return 0; } function lc() { printf "lines: $(/usr/bin/tput lines)\ncolums: $(/usr/bin/tput cols)\n"; return 0; }