meineerde/dotfiles
1
0
Fork 0
mirror of https://github.com/meineerde/dotfiles.git synced 2025-10-17 19:41:01 +00:00
Code Issues Releases Activity

Cleanup and fixes for noprompt environments

Browse Source
This commit is contained in:
Holger Just 2011-05-12 22:19:22 +02:00
parent ce49a825fc
commit 0c218a8257
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.bashrc
View File

@ -36,12 +36,9 @@ export HISTCONTROL=ignoreboth
shopt -s histappend >/dev/null 2>&1 shopt -s histappend >/dev/null 2>&1
# Load RVM
[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
export PG_DATA=/usr/local/var/postgres
# Ruby Settings # Ruby Settings
export RUBY_VERSION=1.8.7 export RUBY_VERSION=1.8.7
export RUBYOPT=-rubygems export RUBYOPT=-rubygems
@ -67,7 +64,7 @@ fi
USER_NAME="Holger Just" USER_NAME="Holger Just"
USER_EMAIL="web@meine-er.de" USER_EMAIL="web@meine-er.de"
# Setting up git. # Setting up git.
if [[ -f ~/.gitconfig ]]; then if [[ -n $NOPROMPT ]] && [[ -f ~/.gitconfig ]]; then
if [ "$(git config --global user.name)" != "$USER_NAME" ]; then if [ "$(git config --global user.name)" != "$USER_NAME" ]; then
echo "WARNING: git's user.name is $(git config --global user.name)" echo "WARNING: git's user.name is $(git config --global user.name)"
fi fi
@ -82,9 +79,9 @@ fi
case `uname` in case `uname` in
Darwin) Darwin)
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home" export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
if [ $(which mate) ]; then if [ $(which mvim) ]; then
export EDITOR="mate" export EDITOR="mvim"
export SVN_EDITOR="mate -wl1" export SVN_EDITOR="mvim -f +1"
fi fi
function fullscreen() { printf "\e[3;0;0;t\e[8;0;0t"; return 0; } function fullscreen() { printf "\e[3;0;0;t\e[8;0;0t"; return 0; }
alias ls='ls -G' alias ls='ls -G'
@ -109,8 +106,10 @@ case `uname` in
unset p python python_path unset p python python_path
export PG_DATA=/usr/local/var/postgres
gitx() { open -a GitX $@; } gitx() { open -a GitX $@; }
pdfman() { man -t $1 | open -a /Applications/Preview.app -f; } pdfman() { man -t $1 | open -a /Applications/Skim.app -f; }
# Bash completion # Bash completion
if [ -f `brew --prefix`/etc/bash_completion ]; then if [ -f `brew --prefix`/etc/bash_completion ]; then