XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop 

Conflicts:
	plugins/available/sdkman.plugin.bash
	themes/base.theme.bash
pull/660/head
Frank Becker 2016-02-04 13:17:51 +01:00
parent 1217a27b06 d938d15f9d
commit df1695db6e
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aliases/available/emacs.aliases.bash
View File

@ -8,7 +8,7 @@ case $OSTYPE in
alias e='emacsclient -n' alias e='emacsclient -n'
alias et='emacsclient -t' alias et='emacsclient -t'
alias ed='emacs --daemon' alias ed='emacs --daemon'
alias E='SUDO_EDITOR="emacsclient" sudo -e' alias E='SUDO_EDITOR=emacsclient sudo -e'
;; ;;
darwin*) darwin*)
alias em='open -a emacs' alias em='open -a emacs'

3
plugins/available/sdkman.plugin.bash
View File

@ -1,6 +1,5 @@
cite about-plugin cite about-plugin
about-plugin 'load Software Development Kit Manager. See http://sdkman.io' about-plugin 'Load Software Development Kit Manager'
export SDKMAN_DIR="$HOME/.sdkman" export SDKMAN_DIR="$HOME/.sdkman"
[[ -s "${SDKMAN_DIR}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR}/bin/sdkman-init.sh" [[ -s "${SDKMAN_DIR}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR}/bin/sdkman-init.sh"

6
themes/base.theme.bash
View File

@ -95,9 +95,9 @@ function scm_prompt_info {
function git_status_summary { function git_status_summary {
awk ' awk '
BEGIN { BEGIN {
untracked = 0 untracked=0;
unstaged = 0 unstaged=0;
staged = 0 staged=0;
} }
{ {
if (!after_first && $0 ~ /^##.+/) { if (!after_first && $0 ~ /^##.+/) {

5
themes/powerline-multiline/powerline-multiline.theme.bash
View File

@ -42,9 +42,8 @@ THEME_PROMPT_CLOCK_FORMAT=${POWERLINE_PROMPT_CLOCK_FORMAT:="%H:%M:%S"}
IN_VIM_THEME_PROMPT_COLOR=245 IN_VIM_THEME_PROMPT_COLOR=245
IN_VIM_THEME_PROMPT_TEXT="vim" IN_VIM_THEME_PROMPT_TEXT="vim"
POWERLINE_LEFT_PROMPT="scm python_venv rvm cwd" POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv rvm cwd"}
POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info" POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
function set_rgb_color { function set_rgb_color {
if [[ "${1}" != "-" ]]; then if [[ "${1}" != "-" ]]; then