Merge pull request #2303 from Bash-it/ira/fix-trigger-happiness

Author: seefood

clean_files.txt

@@ -77,6 +77,7 @@ themes/powerline-naked
 themes/pure
 themes/purity
 themes/rjorgenson
+themes/robbyrussell
 
 # vendor init files
 #

completion/available/aliases.completion.bash

@@ -9,7 +9,7 @@ about-plugin 'Automatic completion of aliases'
 
 # Automatically add completion for all aliases to commands having completion functions
 function _bash-it-component-completion-callback-on-init-aliases() {
-	local namespace="alias_completion"
+	local aliasCommandFunction namespace="alias_completion"
 	local tmp_file completion_loader alias_name line completions chars
 	local alias_arg_words new_completion compl_func compl_wrapper alias_defn
 

themes/powerline-naked/powerline-naked.base.bash

@@ -1,12 +1,11 @@
 # shellcheck shell=bash
-# shellcheck disable=SC2034 # Expected behavior for themes.
-# shellcheck source-path=SCRIPTDIR/../powerline
+# shellcheck disable=SC2034,SC1091 # Expected behavior for themes.
 source "${BASH_IT?}/themes/powerline/powerline.base.bash"
 
 function __powerline_left_segment {
-	local OLD_IFS="${IFS}"
-	IFS="|"
-	local params=("$1")
+	local OLD_IFS="${IFS}" params=()
+	# shellcheck disable=SC2206 # not needed because we are splitting on "|"
+	IFS="|" params=($1)
 	IFS="${OLD_IFS}"
 	local separator=""
 	local pad_before_segment=" "

themes/robbyrussell/robbyrussell.theme.bash

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-
+# shellcheck shell=bash
+# shellcheck disable=SC2034,SC2154
 SCM_THEME_PROMPT_DIRTY=" ${bold_yellow}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" ${bold_blue}scm:("
@@ -22,7 +22,7 @@ function git_prompt_info() {
 }
 
 function prompt_command() {
-  PS1="$(conda_or_venv_prompt)${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${normal} "
+	PS1="$(conda_or_venv_prompt)${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${normal} "
 }
 
 PROMPT_COMMAND=prompt_command