Merge branch 'master' into autoreload

pull/764/head
Nick Silva 2016-08-01 11:25:47 -07:00
commit f82b57b046
3 changed files with 44 additions and 5 deletions

View File

@ -0,0 +1 @@
which kontena > /dev/null && . "$( kontena whoami --bash-completion-path )"

View File

@ -348,19 +348,33 @@ _help-aliases()
_example '$ alias-help git' _example '$ alias-help git'
if [ -n "$1" ]; then if [ -n "$1" ]; then
cat $BASH_IT/aliases/available/$1.aliases.bash | metafor alias | sed "s/$/'/" case $1 in
custom)
alias_path='custom.aliases.bash'
;;
*)
alias_path="available/$1.aliases.bash"
;;
esac
cat $BASH_IT/aliases/$alias_path | metafor alias | sed "s/$/'/"
else else
typeset f typeset f
for f in $BASH_IT/aliases/enabled/* for f in $BASH_IT/aliases/enabled/*
do do
typeset file=$(basename $f) _help-list-aliases $f
printf '\n\n%s:\n' "${file%%.*}"
# metafor() strips trailing quotes, restore them with sed..
cat $f | metafor alias | sed "s/$/'/"
done done
_help-list-aliases $BASH_IT/aliases/custom.aliases.bash
fi fi
} }
_help-list-aliases ()
{
typeset file=$(basename $1)
printf '\n\n%s:\n' "${file%%.*}"
# metafor() strips trailing quotes, restore them with sed..
cat $1 | metafor alias | sed "s/$/'/"
}
_help-plugins() _help-plugins()
{ {
_about 'summarize all functions defined by enabled bash-it plugins' _about 'summarize all functions defined by enabled bash-it plugins'

View File

@ -0,0 +1,24 @@
#!/usr/bin/env bash
SCM_THEME_PROMPT_DIRTY=" ${red}"
SCM_THEME_PROMPT_CLEAN=" ${bold_green}"
SCM_THEME_PROMPT_PREFIX=" |"
SCM_THEME_PROMPT_SUFFIX="${green}|"
GIT_THEME_PROMPT_DIRTY=" ${red}"
GIT_THEME_PROMPT_CLEAN=" ${bold_green}"
GIT_THEME_PROMPT_PREFIX=" ${green}|"
GIT_THEME_PROMPT_SUFFIX="${green}|"
RVM_THEME_PROMPT_PREFIX="|"
RVM_THEME_PROMPT_SUFFIX="|"
function prompt_command() {
if [ $? -eq 0 ]; then
status=❤️
else
status=💔
fi
PS1="\n${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w $status \n${bold_cyan} ${blue}|\t|${green}$(scm_prompt_info) ${green}${reset_color} "
}
PROMPT_COMMAND=prompt_command;