Permalink
Browse files

my.cnf, make rake use padrino rake

  • Loading branch information...
1 parent e5fd4b7 commit 9d5c1864c459773cf87199516ead64560da4ed6d sshaw committed Feb 26, 2013
Showing with 19 additions and 4 deletions.
  1. +7 −3 bash_profile
  2. +10 −1 bashrc
  3. +2 −0 my.cnf
View
@@ -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
+
View
@@ -1,3 +1,4 @@
+alias bc='bundle console'
alias be='bundle exec'
alias bi='bundle install'
alias bl='bundle list'
@@ -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
@@ -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
View
@@ -0,0 +1,2 @@
+[mysql]
+prompt="\d >"

0 comments on commit 9d5c186

Please sign in to comment.