Skip to content

Commit

Permalink
my.cnf, make rake use padrino rake
Browse files Browse the repository at this point in the history
  • Loading branch information
sshaw committed Feb 26, 2013
1 parent e5fd4b7 commit 9d5c186
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
10 changes: 7 additions & 3 deletions bash_profile
Expand Up @@ -20,11 +20,15 @@ LESS=-FRi
#JAVA_HOME=/usr/java/latest on Fed 10

if [ $(uname -s) == "Darwin" ]
then
# On OS X -F quits without displaying
then
# On OS X -F quits without displaying
LESS=-Ri
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi

export LESS
export JAVA_HOME

{ type -t rvm && rvm use default; } > /dev/null 2>&1
gem server --daemon

11 changes: 10 additions & 1 deletion bashrc
@@ -1,3 +1,4 @@
alias bc='bundle console'
alias be='bundle exec'
alias bi='bundle install'
alias bl='bundle list'
Expand All @@ -21,6 +22,8 @@ alias fxml='xmllint --format'
alias vxsd='xmllint --noout --schema'
alias vrng='xmllint --noout --relaxng' # Trang is much better for this...

alias gd='git diff'

shopt -s cdspell cdable_vars cmdhist extglob histappend no_empty_cmd_completion

for f in ~/.rvm/scripts/rvm ~/perl5/perlbrew/etc/bashrc; do
Expand Down Expand Up @@ -118,7 +121,13 @@ psh()
rake()
{
local r=$(which rake)
[ -f "./Gemfile" ] && bundle exec 'rake' "$@" || "$r" "$@"
if [ -f "./.components" ]; then
bundle exec padrino 'rake' "$@"
elif [ -f "./Gemfile" -a -f "./Rakefile" ]; then
bundle exec 'rake' "$@"
else
"$r" "$@"
fi
}

# rm empty directories
Expand Down
2 changes: 2 additions & 0 deletions my.cnf
@@ -0,0 +1,2 @@
[mysql]
prompt="\d >"

0 comments on commit 9d5c186

Please sign in to comment.