From 0d19f1e3f51bc5ee8d75fa57c8994dd556d786c8 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Fri, 27 May 2011 11:36:07 -0500 Subject: [PATCH 1/6] Ignore the plugins/enabled directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fec6fae1..7aed9b0c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ custom/*.bash aliases/custom.aliases.bash lib/custom.bash plugins/custom.plugins.bash +plugins/enabled *.swp From 516ce40c4ee5e062ee600cde2350a8043dfa42c2 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Fri, 27 May 2011 11:40:39 -0500 Subject: [PATCH 2/6] Git ignore works now --- .gitignore | 2 +- plugins/enabled/base.plugin.bash | 1 - plugins/enabled/battery.plugin.bash | 1 - plugins/enabled/browser.plugin.bash | 1 - plugins/enabled/dirs.plugins.bash | 1 - plugins/enabled/git.plugins.bash | 1 - plugins/enabled/hg.plugins.bash | 1 - plugins/enabled/javascript.plugins.bash | 1 - plugins/enabled/jekyll.plugins.bash | 1 - plugins/enabled/latex.plugin.bash | 1 - plugins/enabled/nginx.plugins.bash | 1 - plugins/enabled/osx.plugin.bash | 1 - plugins/enabled/python.plugin.bash | 1 - plugins/enabled/ruby.plugin.bash | 1 - plugins/enabled/rvm.plugin.bash | 1 - plugins/enabled/ssh.plugins.bash | 1 - plugins/enabled/subversion.plugin.bash | 1 - plugins/enabled/tmux.plugin.bash | 1 - plugins/enabled/vagrant.plugins.bash | 1 - plugins/enabled/virtualenv.plugin.bash | 1 - plugins/enabled/z.bash | 1 - 21 files changed, 1 insertion(+), 21 deletions(-) delete mode 120000 plugins/enabled/base.plugin.bash delete mode 120000 plugins/enabled/battery.plugin.bash delete mode 120000 plugins/enabled/browser.plugin.bash delete mode 120000 plugins/enabled/dirs.plugins.bash delete mode 120000 plugins/enabled/git.plugins.bash delete mode 120000 plugins/enabled/hg.plugins.bash delete mode 120000 plugins/enabled/javascript.plugins.bash delete mode 120000 plugins/enabled/jekyll.plugins.bash delete mode 120000 plugins/enabled/latex.plugin.bash delete mode 120000 plugins/enabled/nginx.plugins.bash delete mode 120000 plugins/enabled/osx.plugin.bash delete mode 120000 plugins/enabled/python.plugin.bash delete mode 120000 plugins/enabled/ruby.plugin.bash delete mode 120000 plugins/enabled/rvm.plugin.bash delete mode 120000 plugins/enabled/ssh.plugins.bash delete mode 120000 plugins/enabled/subversion.plugin.bash delete mode 120000 plugins/enabled/tmux.plugin.bash delete mode 120000 plugins/enabled/vagrant.plugins.bash delete mode 120000 plugins/enabled/virtualenv.plugin.bash delete mode 120000 plugins/enabled/z.bash diff --git a/.gitignore b/.gitignore index 7aed9b0c..6be7eefe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +plugins/enabled .DS_Store custom/*.bash !custom/example.bash @@ -5,5 +6,4 @@ custom/*.bash aliases/custom.aliases.bash lib/custom.bash plugins/custom.plugins.bash -plugins/enabled *.swp diff --git a/plugins/enabled/base.plugin.bash b/plugins/enabled/base.plugin.bash deleted file mode 120000 index 4911573b..00000000 --- a/plugins/enabled/base.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/base.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/battery.plugin.bash b/plugins/enabled/battery.plugin.bash deleted file mode 120000 index 2479ed98..00000000 --- a/plugins/enabled/battery.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/battery.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/browser.plugin.bash b/plugins/enabled/browser.plugin.bash deleted file mode 120000 index 956f432d..00000000 --- a/plugins/enabled/browser.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/browser.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/dirs.plugins.bash b/plugins/enabled/dirs.plugins.bash deleted file mode 120000 index 9b352d5f..00000000 --- a/plugins/enabled/dirs.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/dirs.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/git.plugins.bash b/plugins/enabled/git.plugins.bash deleted file mode 120000 index 369848b3..00000000 --- a/plugins/enabled/git.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/git.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/hg.plugins.bash b/plugins/enabled/hg.plugins.bash deleted file mode 120000 index 496dac32..00000000 --- a/plugins/enabled/hg.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/hg.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/javascript.plugins.bash b/plugins/enabled/javascript.plugins.bash deleted file mode 120000 index 3fe79b65..00000000 --- a/plugins/enabled/javascript.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/javascript.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/jekyll.plugins.bash b/plugins/enabled/jekyll.plugins.bash deleted file mode 120000 index 95aa2718..00000000 --- a/plugins/enabled/jekyll.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/jekyll.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/latex.plugin.bash b/plugins/enabled/latex.plugin.bash deleted file mode 120000 index f42846d1..00000000 --- a/plugins/enabled/latex.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/latex.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/nginx.plugins.bash b/plugins/enabled/nginx.plugins.bash deleted file mode 120000 index 00e14643..00000000 --- a/plugins/enabled/nginx.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/nginx.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/osx.plugin.bash b/plugins/enabled/osx.plugin.bash deleted file mode 120000 index 74ecbe31..00000000 --- a/plugins/enabled/osx.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/osx.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/python.plugin.bash b/plugins/enabled/python.plugin.bash deleted file mode 120000 index 00b46444..00000000 --- a/plugins/enabled/python.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/python.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/ruby.plugin.bash b/plugins/enabled/ruby.plugin.bash deleted file mode 120000 index 5c1b3640..00000000 --- a/plugins/enabled/ruby.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/ruby.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/rvm.plugin.bash b/plugins/enabled/rvm.plugin.bash deleted file mode 120000 index 3909f281..00000000 --- a/plugins/enabled/rvm.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/rvm.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/ssh.plugins.bash b/plugins/enabled/ssh.plugins.bash deleted file mode 120000 index 9b57b125..00000000 --- a/plugins/enabled/ssh.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/ssh.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/subversion.plugin.bash b/plugins/enabled/subversion.plugin.bash deleted file mode 120000 index d2a8de2a..00000000 --- a/plugins/enabled/subversion.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/subversion.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/tmux.plugin.bash b/plugins/enabled/tmux.plugin.bash deleted file mode 120000 index bd310446..00000000 --- a/plugins/enabled/tmux.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/tmux.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/vagrant.plugins.bash b/plugins/enabled/vagrant.plugins.bash deleted file mode 120000 index 4a93ac1c..00000000 --- a/plugins/enabled/vagrant.plugins.bash +++ /dev/null @@ -1 +0,0 @@ -../available/vagrant.plugins.bash \ No newline at end of file diff --git a/plugins/enabled/virtualenv.plugin.bash b/plugins/enabled/virtualenv.plugin.bash deleted file mode 120000 index 94a6cf4f..00000000 --- a/plugins/enabled/virtualenv.plugin.bash +++ /dev/null @@ -1 +0,0 @@ -../available/virtualenv.plugin.bash \ No newline at end of file diff --git a/plugins/enabled/z.bash b/plugins/enabled/z.bash deleted file mode 120000 index e7f25a58..00000000 --- a/plugins/enabled/z.bash +++ /dev/null @@ -1 +0,0 @@ -../available/z.bash \ No newline at end of file From 4898fa91198854e6d95b19d4258b39f54b5bc564 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Fri, 27 May 2011 11:47:55 -0500 Subject: [PATCH 3/6] Add pmdown function for previewing markdown files --- plugins/available/base.plugin.bash | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/available/base.plugin.bash b/plugins/available/base.plugin.bash index 94b5e572..e361e04a 100644 --- a/plugins/available/base.plugin.bash +++ b/plugins/available/base.plugin.bash @@ -15,6 +15,17 @@ function myip { echo "Your public IP is: ${bold_green} $res ${normal}" } +# Function for previewing markdown files in the browser + +function pmdown() { + if command -v markdown &>/dev/null + then + markdown $1 | browser + else + echo "You don't have a markdown command installed!" + fi +} + # Make a directory and immediately 'cd' into it function mkcd() { From 1b268e7c282e08fa084b0a3e2609c018530d37f7 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Fri, 27 May 2011 11:53:54 -0500 Subject: [PATCH 4/6] Initialize enabled directory if it doesn't exist This is to make bash_it work in a new install after the plugins/enabled directory was ignored --- bash_it.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bash_it.sh b/bash_it.sh index e0cc579c..b3cdb737 100644 --- a/bash_it.sh +++ b/bash_it.sh @@ -25,6 +25,11 @@ do done # Plugins +if [ ! -d "plugins/enabled" ] +then + mkdir "${BASH}/plugins/enabled" + ln -s ${BASH}/plugins/available/* "${BASH}/plugins/enabled" +fi PLUGINS="${BASH}/plugins/enabled/*.bash" for config_file in $PLUGINS do From 481484394886fb622f8fe3edf3774009b8b891ac Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Fri, 27 May 2011 20:57:57 -0500 Subject: [PATCH 5/6] Fix issue with plugin initalization --- bash_it.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_it.sh b/bash_it.sh index b3cdb737..4a9b30d3 100644 --- a/bash_it.sh +++ b/bash_it.sh @@ -25,7 +25,7 @@ do done # Plugins -if [ ! -d "plugins/enabled" ] +if [ ! -d "${BASH}/plugins/enabled" ] then mkdir "${BASH}/plugins/enabled" ln -s ${BASH}/plugins/available/* "${BASH}/plugins/enabled" From ccf4951d1760a1d95bbba3e8ae84ecf2ad1553d0 Mon Sep 17 00:00:00 2001 From: Joshua Nussbaum Date: Fri, 27 May 2011 23:59:33 -0700 Subject: [PATCH 6/6] Added alias for rake db:migrate --- aliases/rails.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/rails.aliases.bash b/aliases/rails.aliases.bash index d4415f6d..6e1ca149 100644 --- a/aliases/rails.aliases.bash +++ b/aliases/rails.aliases.bash @@ -10,6 +10,7 @@ alias rd='rails dbconsole' alias rp='rails plugin' alias ra='rails application' alias rd='rails destroy' +alias dbm='rake db:migrate' alias ss='script/server' alias ts="thin start" # thin server