Merge remote-tracking branch 'upstream/master'
commit
644e2c4e60
|
|
@ -46,9 +46,9 @@ Anything in the custom directory will be ignored, with the exception of `custom/
|
||||||
|
|
||||||
## Themes
|
## Themes
|
||||||
|
|
||||||
There are a few bash it themes. If you've created your own custom prompts, I'd love it if you shared with everyone else! Just submit a Pull Request to me (revans).
|
There are a few bash it themes. If you've created your own custom prompts, I'd love it if you shared with everyone else! Just submit a Pull Request.
|
||||||
|
|
||||||
You can see the theme screenshots [here](https://github.com/revans/bash-it/wiki/Themes)
|
You can see the theme screenshots [here](https://github.com/Bash-it/bash-it/wiki/Themes)
|
||||||
|
|
||||||
Alternatively, you can preview the themes in your own shell using `BASH_PREVIEW=true reload`
|
Alternatively, you can preview the themes in your own shell using `BASH_PREVIEW=true reload`
|
||||||
|
|
||||||
|
|
@ -89,7 +89,7 @@ It is possible for themes to ignore the `SCM_CHECK` flag and query specific vers
|
||||||
|
|
||||||
### Git prompt
|
### Git prompt
|
||||||
|
|
||||||
Bash it has some nice features related to git, continue reading to know more about.
|
Bash it has some nice features related to Git, continue reading to know more about these features.
|
||||||
|
|
||||||
#### Repository info in the prompt
|
#### Repository info in the prompt
|
||||||
|
|
||||||
|
|
@ -197,5 +197,5 @@ Thanks, and happing bashing!
|
||||||
|
|
||||||
* [List of contributors][contribute]
|
* [List of contributors][contribute]
|
||||||
|
|
||||||
[contribute]: https://github.com/revans/bash-it/contributors
|
[contribute]: https://github.com/Bash-it/bash-it/contributors
|
||||||
[pass password manager]: http://www.passwordstore.org/
|
[pass password manager]: http://www.passwordstore.org/
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,7 @@ else
|
||||||
echo ""
|
echo ""
|
||||||
echo -e "\033[0;32mEnabling sane defaults\033[0m"
|
echo -e "\033[0;32mEnabling sane defaults\033[0m"
|
||||||
load_one completion bash-it.completion.bash
|
load_one completion bash-it.completion.bash
|
||||||
|
load_one plugins alias-completion.bash
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ cite about-plugin
|
||||||
about-plugin 'Automatic completion of aliases'
|
about-plugin 'Automatic completion of aliases'
|
||||||
|
|
||||||
# References:
|
# References:
|
||||||
# http://superuser.com/questions/436314/how-can-i-get-bash-to-perform-tab-completion-for-my-aliases
|
# http://superuser.com/a/437508/119764
|
||||||
# http://stackoverflow.com/a/1793178/1228454
|
# http://stackoverflow.com/a/1793178/1228454
|
||||||
|
|
||||||
# This needs to be a plugin so it gets executed after the completions and the aliases have been defined.
|
# This needs to be a plugin so it gets executed after the completions and the aliases have been defined.
|
||||||
|
|
@ -36,7 +36,7 @@ function alias_completion {
|
||||||
eval "local alias_tokens; alias_tokens=($line)" 2>/dev/null || continue # some alias arg patterns cause an eval parse error
|
eval "local alias_tokens; alias_tokens=($line)" 2>/dev/null || continue # some alias arg patterns cause an eval parse error
|
||||||
local alias_name="${alias_tokens[0]}" alias_cmd="${alias_tokens[1]}" alias_args="${alias_tokens[2]# }"
|
local alias_name="${alias_tokens[0]}" alias_cmd="${alias_tokens[1]}" alias_args="${alias_tokens[2]# }"
|
||||||
|
|
||||||
# skip aliases to pipes, boolan control structures and other command lists
|
# skip aliases to pipes, boolean control structures and other command lists
|
||||||
# (leveraging that eval errs out if $alias_args contains unquoted shell metacharacters)
|
# (leveraging that eval errs out if $alias_args contains unquoted shell metacharacters)
|
||||||
eval "local alias_arg_words; alias_arg_words=($alias_args)" 2>/dev/null || continue
|
eval "local alias_arg_words; alias_arg_words=($alias_args)" 2>/dev/null || continue
|
||||||
# avoid expanding wildcards
|
# avoid expanding wildcards
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,15 @@ case $TERM in
|
||||||
TITLEBAR=""
|
TITLEBAR=""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
PROMPT="${TITLEBAR}${orange}${reset_color}${green}\w${bold_blue}\[\$(scm_prompt_info)\]${reset_color} "
|
|
||||||
|
|
||||||
|
function prompt_command() {
|
||||||
|
PS1="${TITLEBAR}${orange}${reset_color}${green}\w${bold_blue}\[\$(scm_prompt_info)\]${reset_color} "
|
||||||
|
}
|
||||||
|
|
||||||
# scm themeing
|
# scm themeing
|
||||||
SCM_THEME_PROMPT_DIRTY=" ✗"
|
SCM_THEME_PROMPT_DIRTY=" ✗"
|
||||||
SCM_THEME_PROMPT_CLEAN=" ✓"
|
SCM_THEME_PROMPT_CLEAN=" ✓"
|
||||||
SCM_THEME_PROMPT_PREFIX="("
|
SCM_THEME_PROMPT_PREFIX="("
|
||||||
SCM_THEME_PROMPT_SUFFIX=")"
|
SCM_THEME_PROMPT_SUFFIX=")"
|
||||||
|
|
||||||
|
PROMPT_COMMAND=prompt_command;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue