From c86038d61d8dca831e96ab47c86d1b336d9f1fb2 Mon Sep 17 00:00:00 2001 From: Robin Richtsfeld Date: Sat, 9 Dec 2017 15:05:45 +0100 Subject: [PATCH] Fix some Bash issues --- completion/available/docker.completion.bash | 2 +- completion/available/virtualbox.completion.bash | 4 ++-- themes/base.theme.bash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/completion/available/docker.completion.bash b/completion/available/docker.completion.bash index 1495b854..96a8360c 100644 --- a/completion/available/docker.completion.bash +++ b/completion/available/docker.completion.bash @@ -1701,7 +1701,7 @@ _docker_service_tasks() { } _docker_service_update() { - local $subcommand="${words[$subcommand_pos]}" + local subcommand="${words[$subcommand_pos]}" local options_with_args=" --constraint diff --git a/completion/available/virtualbox.completion.bash b/completion/available/virtualbox.completion.bash index 4a660acd..56e0e673 100644 --- a/completion/available/virtualbox.completion.bash +++ b/completion/available/virtualbox.completion.bash @@ -111,7 +111,7 @@ __vboxmanage_default() { for WORD in $opts; do MATCH=0 - for OPT in ${COMP_WORDS[@]}; do + for OPT in "${COMP_WORDS[@]}"; do # opts=$(echo ${opts} | grep -v $OPT); if [ "$OPT" == "$WORD" ]; then MATCH=1 @@ -219,4 +219,4 @@ _vboxmanage() { # echo "Got to end withoug completion" } -complete -F _vboxmanage vboxmanage \ No newline at end of file +complete -F _vboxmanage vboxmanage diff --git a/themes/base.theme.bash b/themes/base.theme.bash index a4dfabb0..8e0d6c11 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -202,7 +202,7 @@ function git_prompt_vars { SCM_STATE=${GIT_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN} if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then [[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && local git_status_flags='-uno' - local status_lines=$((git status --porcelain ${git_status_flags} -b 2> /dev/null || + local status_lines=$($(git status --porcelain ${git_status_flags} -b 2> /dev/null || git status --porcelain ${git_status_flags} 2> /dev/null) | git_status_summary) local status=$(awk 'NR==1' <<< "$status_lines") local counts=$(awk 'NR==2' <<< "$status_lines") @@ -376,7 +376,7 @@ function chruby_version_prompt { ruby_version=$(ruby --version | awk '{print $1, $2;}') || return - if [[ ! $(chruby | grep '*') ]]; then + if [[ ! $(chruby | grep '\*') ]]; then ruby_version="${ruby_version} (system)" fi echo -e "${CHRUBY_THEME_PROMPT_PREFIX}${ruby_version}${CHRUBY_THEME_PROMPT_SUFFIX}"