merge conflict
diff --git a/README.md b/README.md
index 4242bd9..742daf1 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@
aliases-help
rails-help
git-help
+ plugins-help
## Your Custom scripts, aliases, and functions
diff --git a/bash_it.sh b/bash_it.sh
index 0d42fcc..f0c850c 100644
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -68,5 +68,6 @@
echo " git-help This will list out all the aliases you can use with git."
echo " todo-help This will list out all the aliases you can use with todo.txt-cli"
echo " aliases-help Generic list of aliases."
+ echo " plugins-help This will list out all the plugins and functions you can use with bash-it"
echo
}
diff --git a/plugins/base.plugin.bash b/plugins/base.plugin.bash
index b1706e9..9eceaf9 100644
--- a/plugins/base.plugin.bash
+++ b/plugins/base.plugin.bash
@@ -57,12 +57,30 @@
}
# One thing todo
-
function t() {
if [[ "$*" == "" ]] ; then
cat ~/.t
else
echo "$*" > ~/.t
fi
- }
+}
+
+# List all plugins and functions defined by bash-it
+function plugins-help() {
+
+ echo "bash-it Plugins Help-Message"
+ echo
+
+ set | grep "()" \
+ | sed -e "/^_/d" | grep -v "BASH_ARGC=()" \
+ | sed -e "/^\s/d" | grep -v "BASH_LINENO=()" \
+ | grep -v "BASH_ARGV=()" \
+ | grep -v "BASH_SOURCE=()" \
+ | grep -v "DIRSTACK=()" \
+ | grep -v "GROUPS=()" \
+ | grep -v "BASH_CMDS=()" \
+ | grep -v "BASH_ALIASES=()" \
+ | grep -v "COMPREPLY=()" | sed -e "s/()//"
+}
+
diff --git a/plugins/browser.plugin.bash b/plugins/browser.plugin.bash
new file mode 100644
index 0000000..6de184c
--- /dev/null
+++ b/plugins/browser.plugin.bash
@@ -0,0 +1,29 @@
+# based on https://gist.github.com/318247
+
+# Usage: browser
+# pipe html to a browser
+# e.g.
+# $ echo "<h1>hi mom!</h1>" | browser
+# $ ron -5 man/rip.5.ron | browser
+
+function browser() {
+ if [ -t 0 ]; then
+ if [ -n "$1" ]; then
+ open $1
+ else
+ cat <<usage
+Usage: browser
+pipe html to a browser
+
+$ echo '<h1>hi mom!</h1>' | browser
+$ ron -5 man/rip.5.ron | browser
+usage
+
+ fi
+
+ else
+ f="/tmp/browser.$RANDOM.html"
+ cat /dev/stdin > $f
+ open $f
+ fi
+}
diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash
index c8d6204..e719995 100644
--- a/themes/bobby/bobby.theme.bash
+++ b/themes/bobby/bobby.theme.bash
@@ -4,7 +4,9 @@
SCM_THEME_PROMPT_PREFIX=" |"
SCM_THEME_PROMPT_SUFFIX="${green}|"
-PROMPT="\[${bold_blue}\]\[\$(scm_char)\]\[${green}\]\[\$(scm_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt)\] \[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[→ "
+
+PROMPT="\[${bold_blue}\]\[\$(scm_char)\]\[${green}\]\[\$(scm_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt)\] \[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[\n\[${green}\]→\[${reset_color}\] "
+
# git theming
GIT_THEME_PROMPT_DIRTY=" ${red}✗"