From 73d2b4f87e50623dcd5b90439b1583139c3cc96b Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 18 Jan 2015 13:52:22 +0100 Subject: [PATCH 1/6] gvmtool completion - determine local installed versions --- completion/available/gvmtool.completion.bash | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/completion/available/gvmtool.completion.bash b/completion/available/gvmtool.completion.bash index c2158747..3bc9b4ee 100644 --- a/completion/available/gvmtool.completion.bash +++ b/completion/available/gvmtool.completion.bash @@ -41,15 +41,24 @@ _gvm_complete() _gvm_candidate_versions(){ + + CANDIDATE_LOCAL_VERSIONS=$(__gvm_cleanup_local_versions $1) if _gvm_offline; then - __gvmtool_build_version_csv $1 - CANDIDATE_VERSIONS="$(echo $CSV | tr ',' ' ')" + CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS else - CANDIDATE_VERSIONS="$(curl -s "${GVM_SERVICE}/candidates/$1" | tr ',' ' ')" + CANDIDATE_ONLINE_VERSIONS="$(curl -s "${GVM_SERVICE}/candidates/$1" | tr ',' ' ')" + CANDIDATE_VERSIONS="$(echo $CANDIDATE_ONLINE_VERSIONS $CANDIDATE_LOCAL_VERSIONS |sort | uniq ) " fi } +__gvm_cleanup_local_versions(){ + + __gvmtool_build_version_csv $1 + echo $CSV | tr ',' ' ' + +} + _gvm_offline() { if [ "$GVM_ONLINE" = "true" ]; then From 5738e5d45eced88c9dc1d8eb298fa1bcf62088d2 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Tue, 17 Mar 2015 22:13:53 +0100 Subject: [PATCH 2/6] added outdated command to gvmtool completion --- completion/available/gvmtool.completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/completion/available/gvmtool.completion.bash b/completion/available/gvmtool.completion.bash index 3bc9b4ee..163141fc 100644 --- a/completion/available/gvmtool.completion.bash +++ b/completion/available/gvmtool.completion.bash @@ -6,10 +6,10 @@ _gvm_complete() COMPREPLY=() if [ $COMP_CWORD -eq 1 ]; then - COMPREPLY=( $(compgen -W "install uninstall rm list ls use current version default selfupdate broadcast offline help flush" -- ${COMP_WORDS[COMP_CWORD]}) ) + COMPREPLY=( $(compgen -W "install uninstall rm list ls use current outdated version default selfupdate broadcast offline help flush" -- ${COMP_WORDS[COMP_CWORD]}) ) elif [ $COMP_CWORD -eq 2 ]; then case "${COMP_WORDS[COMP_CWORD-1]}" in - "install" | "uninstall" | "rm" | "list" | "ls" | "use" | "current" ) + "install" | "uninstall" | "rm" | "list" | "ls" | "use" | "current" | "outdated" ) CANDIDATES=$(echo "${GVM_CANDIDATES_CSV}" | tr ',' ' ') COMPREPLY=( $(compgen -W "$CANDIDATES" -- ${COMP_WORDS[COMP_CWORD]}) ) ;; From e2a596b7080abff0489a487145b811e03709bdba Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Wed, 23 Sep 2015 12:30:13 +0200 Subject: [PATCH 3/6] renamed gvmtool to sdkman --- ...completion.bash => sdkman.completion.bash} | 24 +++++++++---------- plugins/available/gvmtool.plugin.bash | 6 ----- plugins/available/sdkman.plugin.bash | 5 ++++ 3 files changed, 17 insertions(+), 18 deletions(-) rename completion/available/{gvmtool.completion.bash => sdkman.completion.bash} (73%) delete mode 100644 plugins/available/gvmtool.plugin.bash create mode 100644 plugins/available/sdkman.plugin.bash diff --git a/completion/available/gvmtool.completion.bash b/completion/available/sdkman.completion.bash similarity index 73% rename from completion/available/gvmtool.completion.bash rename to completion/available/sdkman.completion.bash index 163141fc..2bf217bb 100644 --- a/completion/available/gvmtool.completion.bash +++ b/completion/available/sdkman.completion.bash @@ -1,4 +1,4 @@ -_gvm_complete() +_sdkman_complete() { local CANDIDATES local CANDIDATE_VERSIONS @@ -10,7 +10,7 @@ _gvm_complete() elif [ $COMP_CWORD -eq 2 ]; then case "${COMP_WORDS[COMP_CWORD-1]}" in "install" | "uninstall" | "rm" | "list" | "ls" | "use" | "current" | "outdated" ) - CANDIDATES=$(echo "${GVM_CANDIDATES_CSV}" | tr ',' ' ') + CANDIDATES=$(echo "${SDKMAN_CANDIDATES_CSV}" | tr ',' ' ') COMPREPLY=( $(compgen -W "$CANDIDATES" -- ${COMP_WORDS[COMP_CWORD]}) ) ;; "offline" ) @@ -28,7 +28,7 @@ _gvm_complete() elif [ $COMP_CWORD -eq 3 ]; then case "${COMP_WORDS[COMP_CWORD-2]}" in "install" | "uninstall" | "rm" | "use" | "default" ) - _gvm_candidate_versions ${COMP_WORDS[COMP_CWORD-1]} + _sdkman_candidate_versions ${COMP_WORDS[COMP_CWORD-1]} COMPREPLY=( $(compgen -W "$CANDIDATE_VERSIONS" -- ${COMP_WORDS[COMP_CWORD]}) ) ;; *) @@ -39,33 +39,33 @@ _gvm_complete() return 0 } -_gvm_candidate_versions(){ +_sdkman_candidate_versions(){ - CANDIDATE_LOCAL_VERSIONS=$(__gvm_cleanup_local_versions $1) - if _gvm_offline; then + CANDIDATE_LOCAL_VERSIONS=$(__sdkman_cleanup_local_versions $1) + if _sdkman_offline; then CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS else - CANDIDATE_ONLINE_VERSIONS="$(curl -s "${GVM_SERVICE}/candidates/$1" | tr ',' ' ')" + CANDIDATE_ONLINE_VERSIONS="$(curl -s "${SDKMAN_SERVICE}/candidates/$1" | tr ',' ' ')" CANDIDATE_VERSIONS="$(echo $CANDIDATE_ONLINE_VERSIONS $CANDIDATE_LOCAL_VERSIONS |sort | uniq ) " fi } -__gvm_cleanup_local_versions(){ +__sdkman_cleanup_local_versions(){ - __gvmtool_build_version_csv $1 + __sdkmantool_build_version_csv $1 echo $CSV | tr ',' ' ' } -_gvm_offline() +_sdkman_offline() { - if [ "$GVM_ONLINE" = "true" ]; then + if [ "$SDKMAN_ONLINE" = "true" ]; then return 1 else return 0 fi } -complete -F _gvm_complete gvm +complete -F _sdkman_complete sdk diff --git a/plugins/available/gvmtool.plugin.bash b/plugins/available/gvmtool.plugin.bash deleted file mode 100644 index ee69a669..00000000 --- a/plugins/available/gvmtool.plugin.bash +++ /dev/null @@ -1,6 +0,0 @@ -cite about-plugin -about-plugin 'load groovy environment manager' - -GVM_DIR="$HOME/.gvm" - -[[ -s "${GVM_DIR}/bin/gvm-init.sh" ]] && source "${GVM_DIR}/bin/gvm-init.sh" diff --git a/plugins/available/sdkman.plugin.bash b/plugins/available/sdkman.plugin.bash new file mode 100644 index 00000000..0f3722b6 --- /dev/null +++ b/plugins/available/sdkman.plugin.bash @@ -0,0 +1,5 @@ +cite about-plugin +about-plugin 'Load Software Development Kit Manager' + +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "${SDKMAN_DIR}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR}/bin/sdkman-init.sh" From c290aa9638f8cc7b0aa58017576ba67c125cc5d3 Mon Sep 17 00:00:00 2001 From: Eduardo Bellido Bellido Date: Wed, 3 Feb 2016 22:58:19 +0100 Subject: [PATCH 4/6] Fix an error when showing the status of a git repo --- themes/base.theme.bash | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index ee906dee..fffe4b7b 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -94,6 +94,11 @@ function scm_prompt_info { function git_status_summary { awk ' + BEGIN { + untracked=0; + unstaged=0; + staged=0; + } { if (!after_first && $0 ~ /^##.+/) { print $0 From f05c56a4409c6177cf7677928e20c77f1544e971 Mon Sep 17 00:00:00 2001 From: Eduardo Bellido Bellido Date: Wed, 3 Feb 2016 23:03:07 +0100 Subject: [PATCH 5/6] Set fallback values to POWERLINE_LEFT_PROMPT and POWERLINE_RIGHT_PROMPT variables --- themes/powerline-multiline/powerline-multiline.theme.bash | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash index beaf3048..0978e3d0 100644 --- a/themes/powerline-multiline/powerline-multiline.theme.bash +++ b/themes/powerline-multiline/powerline-multiline.theme.bash @@ -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_TEXT="vim" -POWERLINE_LEFT_PROMPT="scm python_venv rvm cwd" -POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info" - +POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv rvm cwd"} +POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"} function set_rgb_color { if [[ "${1}" != "-" ]]; then From 304406b503601be7407f3218bcc87104146e96e3 Mon Sep 17 00:00:00 2001 From: Eduardo Bellido Bellido Date: Thu, 4 Feb 2016 00:11:59 +0100 Subject: [PATCH 6/6] Remove unnecessary double quotes in alias --- aliases/available/emacs.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/emacs.aliases.bash b/aliases/available/emacs.aliases.bash index 1116b117..f8e1259b 100644 --- a/aliases/available/emacs.aliases.bash +++ b/aliases/available/emacs.aliases.bash @@ -8,7 +8,7 @@ case $OSTYPE in alias e='emacsclient -n' alias et='emacsclient -t' alias ed='emacs --daemon' - alias E='SUDO_EDITOR="emacsclient" sudo -e' + alias E='SUDO_EDITOR=emacsclient sudo -e' ;; darwin*) alias em='open -a emacs'