From e5959d4b57c3133d332481472be94a8be1767ef4 Mon Sep 17 00:00:00 2001 From: Doraken Date: Sat, 22 Jul 2023 17:26:49 +0200 Subject: [PATCH] update variable protection update variable protection --- aliases/available/general.aliases.bash | 2 +- bash_it.sh | 23 +- completion/available/aliases.completion.bash | 56 +-- completion/available/apm.completion.bash | 2 +- completion/available/brew.completion.bash | 14 +- completion/available/bundler.completion.bash | 68 ++-- .../available/capistrano.completion.bash | 2 +- completion/available/dart.completion.bash | 2 +- completion/available/defaults.completion.bash | 2 +- completion/available/dirs.completion.bash | 2 +- .../available/docker-compose.completion.bash | 180 +++++----- completion/available/docker.completion.bash | 4 +- completion/available/fabric.completion.bash | 16 +- completion/available/gcloud.completion.bash | 2 +- completion/available/gem.completion.bash | 4 +- completion/available/git.completion.bash | 4 +- completion/available/git_flow.completion.bash | 46 ++- completion/available/gradle.completion.bash | 28 +- completion/available/grunt.completion.bash | 12 +- completion/available/hub.completion.bash | 44 +-- completion/available/knife.completion.bash | 2 +- completion/available/ssh.completion.bash | 10 +- completion/available/vagrant.completion.bash | 4 +- .../available/virtualbox.completion.bash | 4 +- docs/development.rst | 4 +- docs/proxy_support.rst | 2 +- docs/themes-list/barbuk.rst | 4 +- docs/themes-list/codeword.rst | 2 +- docs/themes.rst | 4 +- install.sh | 64 ++-- lib/helpers.bash | 10 +- plugins/available/basher.plugin.bash | 4 +- plugins/available/colors.plugin.bash | 24 +- plugins/available/explain.plugin.bash | 2 +- plugins/available/gif.plugin.bash | 4 +- plugins/available/git.plugin.bash | 4 +- plugins/available/gitstatus.plugin.bash | 2 +- plugins/available/goenv.plugin.bash | 2 +- plugins/available/jekyll.plugin.bash | 4 +- plugins/available/jenv.plugin.bash | 2 +- plugins/available/nodenv.plugin.bash | 2 +- plugins/available/pack.plugin.bash | 4 +- plugins/available/pipsi.plugin.bash | 2 +- plugins/available/proxy.plugin.bash | 4 +- plugins/available/pyenv.plugin.bash | 2 +- plugins/available/rbenv.plugin.bash | 2 +- plugins/available/rvm.plugin.bash | 2 +- plugins/available/tmuxinator.plugin.bash | 2 +- plugins/available/z_autoenv.plugin.bash | 2 +- scripts/reloader.bash | 8 +- template/bash_profile.template.bash | 4 +- test/bash_it/bash_it.bats | 270 +++++++------- test/completion/bash-it.completion.bats | 120 +++---- test/install/install.bats | 46 +-- test/install/uninstall.bats | 32 +- test/lib/helpers.bats | 328 +++++++++--------- test/plugins/go.plugin.bats | 30 +- test/themes/base.theme.svn.bats | 10 +- themes/agnoster/agnoster.theme.bash | 4 +- .../doubletime_multiline.theme.bash | 2 +- .../doubletime_multiline_pyonly.theme.bash | 2 +- themes/gitline/gitline.theme.bash | 2 +- themes/liquidprompt/liquidprompt.theme.bash | 2 +- .../powerline-multiline.base.bash | 2 +- .../powerline-multiline.theme.bash | 2 +- .../powerline-naked/powerline-naked.base.bash | 2 +- .../powerline-naked.theme.bash | 2 +- .../powerline-plain/powerline-plain.base.bash | 2 +- .../powerline-plain.theme.bash | 2 +- themes/powerline/powerline.theme.bash | 2 +- themes/redline/redline.theme.bash | 2 +- uninstall.sh | 30 +- .../github.com/dsifford/yarn-completion/yarn | 12 +- .../github.com/erichs/composure/c_extras.sh | 4 +- .../github.com/erichs/composure/composure.sh | 12 +- 75 files changed, 814 insertions(+), 813 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index c6a62be5..0cf61da2 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -104,4 +104,4 @@ function catt() # bash-it disable alias general # bash-it enable alias bash-it # shellcheck source-path=SCRIPTDIR -source "$BASH_IT/aliases/available/bash-it.aliases.bash" +source "${BASH_IT}/aliases/available/bash-it.aliases.bash" diff --git a/bash_it.sh b/bash_it.sh index ca49b3b2..c8478e38 100755 --- a/bash_it.sh +++ b/bash_it.sh @@ -25,8 +25,9 @@ source "${BASH_IT}/lib/log.bash" # libraries, but skip appearance (themes) for now _log_debug "Loading libraries(except appearance)..." APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash" -for _bash_it_main_file_lib in "${BASH_IT}/lib"/*.bash; do - [[ "$_bash_it_main_file_lib" == "$APPEARANCE_LIB" ]] && continue +for _bash_it_main_file_lib in "${BASH_IT}/lib"/*.bash + do + [[ "$_bash_it_main_file_lib" == "${APPEARANCE_LIB}" ]] && continue _bash-it-log-prefix-by-path "${_bash_it_main_file_lib}" _log_debug "Loading library file..." # shellcheck disable=SC1090 @@ -36,11 +37,12 @@ done # Load the global "enabled" directory, then enabled aliases, completion, plugins # "_bash_it_main_file_type" param is empty so that files get sourced in glob order -for _bash_it_main_file_type in "" "aliases" "plugins" "completion"; do - BASH_IT_LOG_PREFIX="core: reloader: " - # shellcheck disable=SC2140 - source "${BASH_IT}/scripts/reloader.bash" ${_bash_it_main_file_type:+"skip" "$_bash_it_main_file_type"} - BASH_IT_LOG_PREFIX="core: main: " +for _bash_it_main_file_type in "" "aliases" "plugins" "completion" + do + BASH_IT_LOG_PREFIX="core: reloader: " + # shellcheck disable=SC2140 + source "${BASH_IT}/scripts/reloader.bash" ${_bash_it_main_file_type:+"skip" "$_bash_it_main_file_type"} + BASH_IT_LOG_PREFIX="core: main: " done # Load theme, if a theme was set @@ -58,12 +60,13 @@ if [[ -n "${BASH_IT_THEME:-}" ]] BASH_IT_LOG_PREFIX="lib: appearance: " # appearance (themes) now, after all dependencies # shellcheck source=SCRIPTDIR/lib/appearance.bash - source "$APPEARANCE_LIB" + source "${APPEARANCE_LIB}" BASH_IT_LOG_PREFIX="core: main: " fi _log_debug "Loading custom aliases, completion, plugins..." -for _bash_it_main_file_type in "aliases" "completion" "plugins"; do +for _bash_it_main_file_type in "aliases" "completion" "plugins" + do _bash_it_main_file_custom="${BASH_IT}/${_bash_it_main_file_type}/custom.${_bash_it_main_file_type}.bash" if [[ -s "${_bash_it_main_file_custom}" ]] then @@ -90,7 +93,7 @@ done if [[ -n "${PROMPT:-}" ]] then - PS1="${PROMPT}" + PS1="${PROMPT}" fi # Adding Support for other OSes diff --git a/completion/available/aliases.completion.bash b/completion/available/aliases.completion.bash index 2eb57d60..a1dd7908 100644 --- a/completion/available/aliases.completion.bash +++ b/completion/available/aliases.completion.bash @@ -50,45 +50,45 @@ function _bash-it-component-completion-callback-on-init-aliases() alias_defn="${alias_defn%\'}" alias_cmd="${alias_defn%%[[:space:]]*}" # first word of alias if [[ ${alias_defn} == ${alias_cmd} ]] - then - alias_args='' - else - alias_args="${alias_defn#*[[:space:]]}" # everything after first word + then + alias_args='' + else + alias_args="${alias_defn#*[[:space:]]}" # everything after first word fi # skip aliases to pipes, boolean control structures and other command lists chars=$'|&;()<>\n' if [[ "${alias_defn}" =~ [$chars] ]] - then - continue + then + continue fi # avoid expanding wildcards read -ra alias_arg_words <<< "$alias_args" # skip alias if there is no completion function triggered by the aliased command - if ! _bash-it-array-contains-element "$alias_cmd" "${completions[@]}" - then - if [[ -n "$completion_loader" ]] - then - # force loading of completions for the aliased command - "${completion_loader:?}" "${alias_cmd}" - # 124 means completion loader was successful - [[ $? -eq 124 ]] || continue - completions+=("$alias_cmd") - else - continue - fi + if ! _bash-it-array-contains-element "${alias_cmd}" "${completions[@]}" + then + if [[ -n "$completion_loader" ]] + then + # force loading of completions for the aliased command + "${completion_loader:?}" "${alias_cmd}" + # 124 means completion loader was successful + [[ $? -eq 124 ]] || continue + completions+=("$alias_cmd") + else + continue + fi fi new_completion="$(complete -p "$alias_cmd" 2> /dev/null)" # create a wrapper inserting the alias arguments if any - if [[ -n $alias_args ]] - then + if [[ -n ${alias_args} ]] + then compl_func="${new_completion/#* -F /}" compl_func="${compl_func%% *}" # avoid recursive call loops by ignoring our own functions if [[ "${compl_func#_"$namespace"::}" == "$compl_func" ]] - then + then compl_wrapper="_${namespace}::${alias_name}" echo "function $compl_wrapper { local compl_word=\${2?} @@ -96,9 +96,9 @@ function _bash-it-component-completion-callback-on-init-aliases() # check if prec_word is the alias itself. if so, replace it # with the last word in the unaliased form, i.e., # alias_cmd + ' ' + alias_args. - if [[ \$COMP_LINE == \"\$prec_word \$compl_word\" ]] - then - prec_word='$alias_cmd $alias_args' + if [[ \$COMP{_LINE == \"\${prec_word} \${compl_word}\" ]] + then + prec_word='${alias_cmd} $alias_args' prec_word=\${prec_word#* } fi (( COMP_CWORD += ${#alias_arg_words[@]} )) @@ -108,19 +108,19 @@ function _bash-it-component-completion-callback-on-init-aliases() (( COMP_POINT += \${#COMP_LINE} )) \"$compl_func\" \"$alias_cmd\" \"\$compl_word\" \"\$prec_word\" }" >> "$tmp_file" - new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }" + new_completion="${new_completion}/ -F ${compl_func} / -F ${compl_wrapper} }" fi fi # replace completion trigger by alias - if [[ -n $new_completion ]] + if [[ -n ${new_completion} ]] then - new_completion="${new_completion% *} $alias_name" + new_completion="${new_completion% *} ${alias_name}" echo "$new_completion" >> "$tmp_file" fi done < <(alias -p) # shellcheck source=/dev/null - source "$tmp_file" && command rm -f "$tmp_file" + source "${tmp_file}" && command rm -f "${tmp_file}" ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" diff --git a/completion/available/apm.completion.bash b/completion/available/apm.completion.bash index c3dcfe45..3c4538d7 100644 --- a/completion/available/apm.completion.bash +++ b/completion/available/apm.completion.bash @@ -1,4 +1,4 @@ # shellcheck shell=bash about-completion "apm completion" # shellcheck disable=SC1090 -source "${BASH_IT}"/vendor/github.com/vigo/apm-bash-completion/apm +source "${BASH_IT}/vendor/github.com/vigo/apm-bash-completion/apm" diff --git a/completion/available/brew.completion.bash b/completion/available/brew.completion.bash index af933cb6..440563f1 100644 --- a/completion/available/brew.completion.bash +++ b/completion/available/brew.completion.bash @@ -5,7 +5,7 @@ about-completion "brew completion" # Load late to make sure `system` completion loads first # BASH_IT_LOAD_PRIORITY: 375 -if [[ "$OSTYPE" != 'darwin'* ]]; +if [[ "${OSTYPE}" != 'darwin'* ]]; then _log_warning "unsupported operating system - only 'Darwin' is supported" return 0 @@ -14,21 +14,21 @@ fi # Make sure brew is installed _bash_it_homebrew_check || return 0 -if [[ -r "$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d/brew" ]] +if [[ -r "${BASH_IT_HOMEBREW_PREFIX}/etc/bash_completion.d/brew" ]] then # shellcheck disable=1090,1091 - source "$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d/brew" + source "${BASH_IT_HOMEBREW_PREFIX}/etc/bash_completion.d/brew" -elif [[ -r "$BASH_IT_HOMEBREW_PREFIX/Library/Contributions/brew_bash_completion.sh" ]] +elif [[ -r "${BASH_IT_HOMEBREW_PREFIX}/Library/Contributions/brew_bash_completion.sh" ]] then # shellcheck disable=1090,1091 - source "$BASH_IT_HOMEBREW_PREFIX/Library/Contributions/brew_bash_completion.sh" + source "${BASH_IT_HOMEBREW_PREFIX}/Library/Contributions/brew_bash_completion.sh" -elif [[ -f "$BASH_IT_HOMEBREW_PREFIX/completions/bash/brew" ]] +elif [[ -f "${BASH_IT_HOMEBREW_PREFIX}/completions/bash/brew" ]] then # For the git-clone based installation, see here for more info: # https://github.com/Bash-it/bash-it/issues/1458 # https://docs.brew.sh/Shell-Completion # shellcheck disable=1090,1091 - source "$BASH_IT_HOMEBREW_PREFIX/completions/bash/brew" + source "${BASH_IT_HOMEBREW_PREFIX}/completions/bash/brew" fi diff --git a/completion/available/bundler.completion.bash b/completion/available/bundler.completion.bash index 90aa266b..077e70cc 100644 --- a/completion/available/bundler.completion.bash +++ b/completion/available/bundler.completion.bash @@ -47,41 +47,41 @@ function __bundle() options="-V --help --no-color --no-no-color --verbose --no-verbose" case $bundle_command in "") - options="$options --version";; + options="${options} --version";; check) - options="$options --dry-run --gemfile --path -r --retry";; + options="${options} --dry-run --gemfile --path -r --retry";; clean) - options="$options --dry-run --force";; + options="${options} --dry-run --force";; config) - options="$options --local --global --delete";; + options="${options} --local --global --delete";; doctor) - options="$options --gemfile --quiet --no-quiet";; + options="${options} --gemfile --quiet --no-quiet";; gem) - options="$options -b -e -t --bin --coc --no-coc --edit --exe + options="${options} -b -e -t --bin --coc --no-coc --edit --exe --no-exe --ext --no-ext --mit --no-mit --test";; init) - options="$options --gemspec";; + options="${options} --gemspec";; install) - options="$options --binstubs --clean --deployment --force --frozen + options="${options} --binstubs --clean --deployment --force --frozen --full-index --gemfile --jobs --local --no-cache --no-prune --path --quiet --retry --shebang --standalone --system --trust-policy --with --without";; lock) - options="$options --add-platform --conservative --full-index + options="${options} --add-platform --conservative --full-index --local --lockfile --major --minor --patch --print --remove-platform --strict --update";; package) - options="$options --all --all-platforms";; + options="${options} --all --all-platforms";; platform) - options="$options --ruby";; + options="${options} --ruby";; show) options="$options --outdated --paths --no-paths";; update) - options="$options --bundler --conservative --force --full-index + options="${options} --bundler --conservative --force --full-index --group --jobs --local --major --minor --patch --quiet --ruby --source --strict";; viz) - options="$options -f -F -R -v -W --file --format --requirements + options="${options} -f -F -R -v -W --file --format --requirements --no-requirements --version --no-version --without";; esac else @@ -92,7 +92,7 @@ function __bundle() platform clean doctor" ;; check | install) - case $prev in + case ${prev} in --binstubs | --path) _filedir -d return;; @@ -105,7 +105,7 @@ function __bundle() esac ;; config) - case $prev in + case ${prev} in config | --*) case $cur in local.*) @@ -150,11 +150,11 @@ function __bundle() then # Figure out Bundler's binaries dir local bundler_bin=$(__bundle_exec_ruby 'puts Bundler.bundle_path + "bin"') - if [[ -d $bundler_bin ]] + if [[ -d ${bundler_bin} ]] then - local binaries=("$bundler_bin"/*) + local binaries=("${bundler_bin}"/*) # If there are binaries, strip directory name and use them - [[ -f "$binaries" ]] && options="${binaries[@]##*/}" + [[ -f "${binaries}" ]] && options="${binaries[@]##*/}" else # No binaries found; use full command completion COMPREPLY=($(compgen -c -- "$cur")) @@ -176,7 +176,7 @@ function __bundle() esac ;; update) - case $prev in + case ${prev} in --group) __bundle_complete_groups return;; @@ -185,7 +185,7 @@ function __bundle() esac ;; viz) - case $prev in + case ${prev} in -F | --format) options="dot jpg png svg";; -W | --without) @@ -209,12 +209,13 @@ function __bundle_get_command() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local i - for ((i=1; i < $COMP_CWORD; ++i)); do + for ((i=1; i < $COMP_CWORD; ++i)) + do local arg=${COMP_WORDS[$i]} - case $arg in + case ${arg} in [^-]*) - bundle_command=$arg + bundle_command=${arg} bundle_command_index=$((i + 1)) return;; --version) @@ -248,7 +249,7 @@ function __bundle_complete_groups() # All groups written before local prefix=${cur%"$cur_group"} local groups=$(__bundle_exec_ruby 'puts Bundler.definition.dependencies.map(&:groups).reduce(:|).map(&:to_s)') - if [[ ! $groups ]] + if [[ ! ${groups} ]] then COMPREPLY=() return @@ -257,8 +258,8 @@ function __bundle_complete_groups() # strips it; groups may be separated by ':', ' ', or '\ ' local excluded=$'\ndefault\n'${prefix//[: \'\"\\]/$'\n'} # Include them twice to ensure they are duplicates - groups=$groups$excluded$excluded - COMPREPLY=($(compgen -W "$(sort <<<"$groups" | uniq -u)" -- "$cur_group")) + groups=${groups}${excluded}${excluded} + COMPREPLY=($(compgen -W "$(sort <<<"${groups}" | uniq -u)" -- "${cur_group}")) # Prepend prefix to all entries COMPREPLY=("${COMPREPLY[@]/#/$prefix}") __ltrim_colon_completions "$cur" @@ -284,24 +285,23 @@ function __bundle_exec_ruby() # cadastrophic mistake; it just means the cache won't be invalidated when # the local gem list changes (but will still invalidate if the command is # run on another directory) - local lockfile=$PWD/Gemfile.lock + local lockfile=${PWD}/Gemfile.lock local cachedir=${XDG_CACHE_HOME:-~/.cache}/completion-ruby - local cachefile=$cachedir/bundle--exec-ruby + local cachefile=${cachedir}/bundle--exec-ruby # A representation of all arguments with newlines replaced by spaces, # to fit in a single line as a cache identifier local cache_id_line="${bundle_bin[*]} @ $lockfile: ${*//$'\n'/ }" - if [[ (! -f $lockfile || $cachefile -nt $lockfile) && - $(head -n 1 -- "$cachefile" 2>/dev/null) = "$cache_id_line" ]] + if [[ (! -f $lockfile || $cachefile -nt $lockfile) && $(head -n 1 -- "${cachefile}" 2>/dev/null) = "$cache_id_line" ]] then - tail -n +2 -- "$cachefile" + tail -n +2 -- "${cachefile}" else local output=$("${bundle_bin[@]}" exec ruby -e "${@}" 2>/dev/null) if [[ $? -eq 0 ]] then - (mkdir -p -- "$cachedir" && - echo "$cache_id_line"$'\n'"$output" >$cachefile) 2>/dev/null - echo "$output" + (mkdir -p -- "${cachedir}" && + echo "${cache_id_line}"$'\n'"$output" >${cachefile}) 2>/dev/null + echo "${output}" fi fi diff --git a/completion/available/capistrano.completion.bash b/completion/available/capistrano.completion.bash index e5f7cad1..399f9c8f 100644 --- a/completion/available/capistrano.completion.bash +++ b/completion/available/capistrano.completion.bash @@ -12,7 +12,7 @@ function _capcomplete() if [ -f Capfile ] then recent=`ls -t .cap_tasks~ Capfile **/*.cap 2> /dev/null | head -n 1` - if [[ $recent != '.cap_tasks~' ]] + if [[ ${recent} != '.cap_tasks~' ]] then cap --version | grep 'Capistrano v2.' > /dev/null if [ $? -eq 0 ] diff --git a/completion/available/dart.completion.bash b/completion/available/dart.completion.bash index 07d2849a..09520cb6 100644 --- a/completion/available/dart.completion.bash +++ b/completion/available/dart.completion.bash @@ -14,7 +14,7 @@ function __dart_completion() local HELP="--help -h" local VERBOSE="-v --verbose" - case $prev in + case ${prev} in analyze) # shellcheck disable=SC2207 COMPREPLY=($(compgen -W "$HELP --fatal-infos --no-fatal-warnings --fatal-warnings" -- "$curr")) diff --git a/completion/available/defaults.completion.bash b/completion/available/defaults.completion.bash index 6adb803e..86ce1a81 100644 --- a/completion/available/defaults.completion.bash +++ b/completion/available/defaults.completion.bash @@ -1,6 +1,6 @@ # shellcheck shell=bash -if test -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash" +if test -s "${BASH_IT}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash" then source "$_" fi diff --git a/completion/available/dirs.completion.bash b/completion/available/dirs.completion.bash index ae72647e..30469f4c 100644 --- a/completion/available/dirs.completion.bash +++ b/completion/available/dirs.completion.bash @@ -10,7 +10,7 @@ function _dirs-complete() local CURRENT_PROMPT="${COMP_WORDS[COMP_CWORD]}" # parse all defined shortcuts from ~/.dirs - if [ -r "$HOME/.dirs" ] + if [ -r "${HOME}/.dirs" ] then COMPREPLY=($(compgen -W "$(grep -v '^#' ~/.dirs | sed -e 's/\(.*\)=.*/\1/')" -- ${CURRENT_PROMPT}) ) fi diff --git a/completion/available/docker-compose.completion.bash b/completion/available/docker-compose.completion.bash index 804bce73..4c000c6a 100755 --- a/completion/available/docker-compose.completion.bash +++ b/completion/available/docker-compose.completion.bash @@ -55,7 +55,7 @@ function __docker_compose_to_alternatives() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - local parts=( $1 ) + local parts=( ${1} ) local IFS='|' echo "${parts[*]}" @@ -85,8 +85,8 @@ function __docker_compose_has_option() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local pattern="${1}" - for (( i=2; i < $cword; ++i)); do - if [[ ${words[$i]} =~ ^($pattern)$ ]] + for (( i=2; i < ${cword}; ++i)); do + if [[ ${words[$i]} =~ ^(${pattern})$ ]] then return 0 fi @@ -110,25 +110,25 @@ function __docker_compose_map_key_of_current_option() local glob="${1}" local key glob_pos - if [ "$cur" = "=" ] - then # key= case + if [ "${cur}" = "=" ] + then # key= case key="$prev" glob_pos=$((cword - 2)) - elif [[ $cur == *=* ]] - then # key=value case (OSX) - key=${cur%=*} - glob_pos=$((cword - 1)) - elif [ "$prev" = "=" ] - then - key=${words[$cword - 2]} # key=value case - glob_pos=$((cword - 3)) - else + elif [[ $cur == *=* ]] + then # key=value case (OSX) + key=${cur%=*} + glob_pos=$((cword - 1)) + elif [ "$prev" = "=" ] + then + key=${words[$cword - 2]} # key=value case + glob_pos=$((cword - 3)) + else return fi [ "${words[$glob_pos]}" = "=" ] && ((glob_pos--)) # --option=key=value syntax - [[ ${words[$glob_pos]} == @($glob) ]] && echo "$key" + [[ ${words[$glob_pos]} == @(${glob}) ]] && echo "${key}" ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -205,7 +205,7 @@ function _docker_compose_build() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --build-arg) COMPREPLY=( $( compgen -e -- "$cur" ) ) __docker_compose_nospace @@ -237,7 +237,7 @@ function _docker_compose_bundle() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --output|-o) _filedir return @@ -258,7 +258,7 @@ function _docker_compose_config() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --hash) if [[ $cur == \\* ]] then @@ -284,7 +284,7 @@ function _docker_compose_create() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) COMPREPLY=( $( compgen -W "--build --force-recreate --help --no-build --no-recreate" -- "$cur" ) ) ;; @@ -305,7 +305,7 @@ function _docker_compose_docker_compose() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --tlscacert|--tlscert|--tlskey) _filedir return @@ -322,14 +322,14 @@ function _docker_compose_docker_compose() _filedir -d return ;; - $(__docker_compose_to_extglob "$daemon_options_with_args") ) + $(__docker_compose_to_extglob "${daemon_options_with_args}") ) return ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "$daemon_boolean_options $daemon_options_with_args $top_level_options_with_args --help -h --no-ansi --verbose --version -v" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "${daemon_boolean_options} ${daemon_options_with_args} ${top_level_options_with_args} --help -h --no-ansi --verbose --version -v" -- "${cur}" ) ) ;; *) COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) ) @@ -358,7 +358,7 @@ function _docker_compose_down() ;; esac - case "$cur" in + case "${cur}" in -*) COMPREPLY=( $( compgen -W "--help --rmi --timeout -t --volumes -v --remove-orphans" -- "$cur" ) ) ;; @@ -376,13 +376,13 @@ function _docker_compose_events() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --json) return ;; esac - case "$cur" in + case "${cur}" in -*) COMPREPLY=( $( compgen -W "--help --json" -- "$cur" ) ) ;; @@ -403,15 +403,15 @@ function _docker_compose_exec() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --index|--user|-u|--workdir|-w) return ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "-d --detach --help --index --privileged -T --user -u --workdir -w" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "-d --detach --help --index --privileged -T --user -u --workdir -w" -- "${cur}" ) ) ;; *) __docker_compose_complete_running_services @@ -430,7 +430,7 @@ function _docker_compose_help() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "${commands[*]}" -- "${cur}" ) ) ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -445,7 +445,7 @@ function _docker_compose_images() ###################################################### case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --quiet -q" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --quiet -q" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -463,16 +463,16 @@ function _docker_compose_kill() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in -s) - COMPREPLY=( $( compgen -W "SIGHUP SIGINT SIGKILL SIGUSR1 SIGUSR2" -- "$(echo $cur | tr '[:lower:]' '[:upper:]')" ) ) + COMPREPLY=( $( compgen -W "SIGHUP SIGINT SIGKILL SIGUSR1 SIGUSR2" -- "$(echo ${cur} | tr '[:lower:]' '[:upper:]')" ) ) return ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help -s" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help -s" -- "${cur}" ) ) ;; *) __docker_compose_complete_running_services @@ -491,15 +491,15 @@ function _docker_compose_logs() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --tail) return ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--follow -f --help --no-color --tail --timestamps -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--follow -f --help --no-color --tail --timestamps -t" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -518,9 +518,9 @@ function _docker_compose_pause() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help" -- "${cur}" ) ) ;; *) __docker_compose_complete_running_services @@ -539,9 +539,9 @@ function _docker_compose_port() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --protocol) - COMPREPLY=( $( compgen -W "tcp udp" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "tcp udp" -- "${cur}" ) ) return; ;; --index) @@ -549,9 +549,9 @@ function _docker_compose_port() ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help --index --protocol" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --index --protocol" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -571,7 +571,7 @@ function _docker_compose_ps() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local key=$(__docker_compose_map_key_of_current_option '--filter') - case "$key" in + case "${key}" in source) COMPREPLY=( $( compgen -W "build image" -- "${cur##*=}" ) ) return @@ -582,17 +582,17 @@ function _docker_compose_ps() ;; esac - case "$prev" in + case "${prev}" in --filter) - COMPREPLY=( $( compgen -W "source status" -S "=" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "source status" -S "=" -- "${cur}" ) ) __docker_compose_nospace return; ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--all -a --filter --help --quiet -q --services" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--all -a --filter --help --quiet -q --services" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -611,9 +611,9 @@ function _docker_compose_pull() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --include-deps --no-parallel --quiet -q" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --include-deps --no-parallel --quiet -q" -- "${cur}" ) ) ;; *) __docker_compose_complete_services --filter source=image @@ -632,9 +632,9 @@ function _docker_compose_push() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help --ignore-push-failures" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --ignore-push-failures" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -653,15 +653,15 @@ function _docker_compose_restart() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --timeout|-t) return ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --timeout -t" -- "${cur}" ) ) ;; *) __docker_compose_complete_running_services @@ -680,9 +680,9 @@ function _docker_compose_rm() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--force -f --help --stop -s -v" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--force -f --help --stop -s -v" -- "${cur}" ) ) ;; *) if __docker_compose_has_option "--stop|-s" @@ -706,9 +706,9 @@ function _docker_compose_run() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in -e) - COMPREPLY=( $( compgen -e -- "$cur" ) ) + COMPREPLY=( $( compgen -e -- "${cur}" ) ) __docker_compose_nospace return ;; @@ -717,9 +717,9 @@ function _docker_compose_run() ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--detach -d --entrypoint -e --help --label -l --name --no-deps --publish -p --rm --service-ports -T --use-aliases --user -u --volume -v --workdir -w" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--detach -d --entrypoint -e --help --label -l --name --no-deps --publish -p --rm --service-ports -T --use-aliases --user -u --volume -v --workdir -w" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -738,9 +738,9 @@ function _docker_compose_scale() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in =) - COMPREPLY=("$cur") + COMPREPLY=("${cur}") return ;; --timeout|-t) @@ -748,12 +748,12 @@ function _docker_compose_scale() ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --timeout -t" -- "${cur}" ) ) ;; *) - COMPREPLY=( $(compgen -S "=" -W "$(__docker_compose_services)" -- "$cur") ) + COMPREPLY=( $(compgen -S "=" -W "$(__docker_compose_services)" -- "${cur}") ) __docker_compose_nospace ;; esac @@ -770,9 +770,9 @@ function _docker_compose_start() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help" -- "${cur}" ) ) ;; *) __docker_compose_complete_services --filter status=stopped @@ -791,15 +791,15 @@ function _docker_compose_stop() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in --timeout|-t) return ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help --timeout -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --timeout -t" -- "${cur}" ) ) ;; *) __docker_compose_complete_running_services @@ -818,9 +818,9 @@ function _docker_compose_top() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help" -- "${cur}" ) ) ;; *) __docker_compose_complete_running_services @@ -839,9 +839,9 @@ function _docker_compose_unpause() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help" -- "${cur}" ) ) ;; *) __docker_compose_complete_services --filter status=paused @@ -860,9 +860,9 @@ function _docker_compose_up() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$prev" in + case "${prev}" in =) - COMPREPLY=("$cur") + COMPREPLY=("${cur}") return ;; --exit-code-from) @@ -870,7 +870,7 @@ function _docker_compose_up() return ;; --scale) - COMPREPLY=( $(compgen -S "=" -W "$(__docker_compose_services)" -- "$cur") ) + COMPREPLY=( $(compgen -S "=" -W "$(__docker_compose_services)" -- "${cur}") ) __docker_compose_nospace return ;; @@ -879,9 +879,9 @@ function _docker_compose_up() ;; esac - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "${cur}" ) ) ;; *) __docker_compose_complete_services @@ -900,9 +900,9 @@ function _docker_compose_version() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - case "$cur" in + case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--short" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--short" -- "${cur}" ) ) ;; esac @@ -918,7 +918,7 @@ function _docker_compose() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - local previous_extglob_setting=$(shopt -p extglob) + local previous_extglob_setting="$(shopt -p extglob)" shopt -s extglob local commands=( @@ -982,18 +982,18 @@ function _docker_compose() local top_level_options=() local counter=1 - while [ $counter -lt $cword ]; do + while [ ${counter} -lt ${cword} ]; do case "${words[$counter]}" in - $(__docker_compose_to_extglob "$daemon_boolean_options") ) + $(__docker_compose_to_extglob "${daemon_boolean_options}") ) local opt=${words[counter]} top_level_options+=($opt) ;; - $(__docker_compose_to_extglob "$daemon_options_with_args") ) + $(__docker_compose_to_extglob "${daemon_options_with_args}") ) local opt=${words[counter]} local arg=${words[++counter]} top_level_options+=($opt $arg) ;; - $(__docker_compose_to_extglob "$top_level_options_with_args") ) + $(__docker_compose_to_extglob "${top_level_options_with_args}") ) (( counter++ )) ;; -*) @@ -1007,7 +1007,7 @@ function _docker_compose() done local completions_func=_docker_compose_${command//-/_} - _is_function $completions_func && $completions_func + _is_function ${completions_func} && ${completions_func} eval "$previous_extglob_setting" return 0 @@ -1017,7 +1017,7 @@ function _docker_compose() #################################################### } -eval "$__docker_compose_previous_extglob_setting" +eval "${__docker_compose_previous_extglob_setting}" unset __docker_compose_previous_extglob_setting complete -F _docker_compose docker-compose docker-compose.exe diff --git a/completion/available/docker.completion.bash b/completion/available/docker.completion.bash index 652a0616..6dcd07f6 100644 --- a/completion/available/docker.completion.bash +++ b/completion/available/docker.completion.bash @@ -16,10 +16,10 @@ _docker_bash_completion_paths=( ) for fn in "${_docker_bash_completion_paths[@]}"; do - if [ -r "$fn" ] + if [ -r "${fn}" ] then # shellcheck disable=SC1090 - source "$fn" + source "${fn}" break fi done diff --git a/completion/available/fabric.completion.bash b/completion/available/fabric.completion.bash index aab11cce..792aefcf 100644 --- a/completion/available/fabric.completion.bash +++ b/completion/available/fabric.completion.bash @@ -41,7 +41,7 @@ export FAB_COMPLETION_CACHED_TASKS_FILENAME=".fab_tasks~" # Set command to get time of last file modification as seconds since Epoch -case "$OSTYPE" in +case "${OSTYPE}" in 'darwin'*|'freebsd'*) __FAB_COMPLETION_MTIME_COMMAND="stat -f '%m'" ;; @@ -62,7 +62,7 @@ function __fab_chache_mtime() ###################################################### ${__FAB_COMPLETION_MTIME_COMMAND} \ - $FAB_COMPLETION_CACHED_TASKS_FILENAME | xargs -n 1 expr + ${FAB_COMPLETION_CACHED_TASKS_FILENAME} | xargs -n 1 expr ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -81,12 +81,12 @@ function __fab_fabfile_mtime() ###################################################### local f="fabfile" - if [[ -e "$f.py" ]] + if [[ -e "${f}.py" ]] then ${__FAB_COMPLETION_MTIME_COMMAND} "$f.py" | xargs -n 1 expr else # Suppose that it's a fabfile dir - find $f/*.py -exec ${__FAB_COMPLETION_MTIME_COMMAND} {} + \ + find ${f}/*.py -exec ${__FAB_COMPLETION_MTIME_COMMAND} {} + \ | xargs -n 1 expr | sort -n -r | head -1 fi @@ -128,7 +128,7 @@ function __fab_completion() # It's left here just for history. # -*) # if [[ -z "${__FAB_COMPLETION_SHORT_OPT}" ]] - then + #then # export __FAB_COMPLETION_SHORT_OPT=$( # fab --help | grep -E -o "^ +\-[A-Za-z_\]" | sort -u) # fi @@ -141,7 +141,7 @@ function __fab_completion() if [[ -e "$f.py" || (-d "$f" && -e "$f/__init__.py") ]] then # Build a list of the available tasks - if $FAB_COMPLETION_CACHE_TASKS + if ${FAB_COMPLETION_CACHE_TASKS} then # If use cache if [[ ! -s ${FAB_COMPLETION_CACHED_TASKS_FILENAME} || @@ -150,10 +150,10 @@ function __fab_completion() fab --shortlist > ${FAB_COMPLETION_CACHED_TASKS_FILENAME} \ 2> /dev/null fi - opts=$(cat ${FAB_COMPLETION_CACHED_TASKS_FILENAME}) + opts="$(cat ${FAB_COMPLETION_CACHED_TASKS_FILENAME})" else # Without cache - opts=$(fab --shortlist 2> /dev/null) + opts="$(fab --shortlist 2> /dev/null)" fi fi ;; diff --git a/completion/available/gcloud.completion.bash b/completion/available/gcloud.completion.bash index 14cd6c55..b613a8f9 100644 --- a/completion/available/gcloud.completion.bash +++ b/completion/available/gcloud.completion.bash @@ -10,6 +10,6 @@ if _command_exists gcloud # source all the bash completion file that are available for i in "${GOOGLE_SDK_ROOT}"/*.bash.inc; do # shellcheck disable=SC1090 - source "$i" + source "${i}" done fi diff --git a/completion/available/gem.completion.bash b/completion/available/gem.completion.bash index 5dc28c68..5ca7df93 100644 --- a/completion/available/gem.completion.bash +++ b/completion/available/gem.completion.bash @@ -13,7 +13,7 @@ function __gem_completion() case $prev in install) # list the remote gems and add to completion - if [ -z "$REMOTE_GEMS" ] + if [ -z "${REMOTE_GEMS}" ] then read -r -a REMOTE_GEMS <<< "$(gem list --remote --no-versions | sed 's/\*\*\* REMOTE GEMS \*\*\*//' | tr '\n' ' ')" fi @@ -29,7 +29,7 @@ function __gem_completion() local cur=${COMP_WORDS[COMP_CWORD]} # shellcheck disable=SC2207 - COMPREPLY=($(compgen -W "${LOCAL_GEMS[*]}" -- "$cur")) + COMPREPLY=($(compgen -W "${LOCAL_GEMS[*]}" -- "${cur}")) return 0 ;; esac diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash index f011a21f..2238c179 100644 --- a/completion/available/git.completion.bash +++ b/completion/available/git.completion.bash @@ -29,11 +29,11 @@ _git_bash_completion_paths=( # Load the first completion file found _git_bash_completion_found=false for _comp_path in "${_git_bash_completion_paths[@]}"; do - if [[ -r "$_comp_path" ]] + if [[ -r "${_comp_path}" ]] then _git_bash_completion_found=true # shellcheck disable=SC1090 # don't follow - source "$_comp_path" + source "${_comp_path}" break fi done diff --git a/completion/available/git_flow.completion.bash b/completion/available/git_flow.completion.bash index 36232b3a..58d7025c 100644 --- a/completion/available/git_flow.completion.bash +++ b/completion/available/git_flow.completion.bash @@ -52,14 +52,14 @@ function _git_flow () Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local subcommands="init feature release hotfix" - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ] + local subcommand="$(__git_find_subcommand "${subcommands}")" + if [ -z "${subcommand}" ] then - __gitcomp "$subcommands" + __gitcomp "${subcommands}" return fi - case "$subcommand" in + case "${subcommand}" in feature) __git_flow_feature return @@ -89,14 +89,14 @@ function __git_flow_feature () Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local subcommands="list start finish publish track diff rebase checkout pull" - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ] + local subcommand="$(__git_find_subcommand "${subcommands}")" + if [ -z "${subcommand}" ] then - __gitcomp "$subcommands" + __gitcomp "${subcommands}" return fi - case "$subcommand" in + case "${subcommand}" in pull) __gitcomp "$(__git_remotes)" return @@ -169,14 +169,14 @@ function __git_flow_release () Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local subcommands="list start finish" - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ] + local subcommand="$(__git_find_subcommand "${subcommands}")" + if [ -z "${subcommand}" ] then - __gitcomp "$subcommands" + __gitcomp "${subcommands}" return fi - case "$subcommand" in + case "${subcommand}" in finish) __gitcomp "$(__git_flow_list_releases)" return @@ -212,14 +212,14 @@ function __git_flow_hotfix () Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local subcommands="list start finish" - local subcommand="$(__git_find_subcommand "$subcommands")" - if [ -z "$subcommand" ] + local subcommand="$(__git_find_subcommand "${subcommands}")" + if [ -z "${subcommand}" ] then - __gitcomp "$subcommands" + __gitcomp "${subcommands}" return fi - case "$subcommand" in + case "${subcommand}" in finish) __gitcomp "$(__git_flow_list_hotfixes)" return @@ -232,23 +232,19 @@ function __git_flow_hotfix () ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" #################################################### - - ############### Stack_TRACE_BUILDER ################ - Function_PATH="$( dirname ${Function_PATH} )" - #################################################### } function __git_flow_list_hotfixes () { + ############ STACK_TRACE_BUILDER ##################### + Function_Name="${FUNCNAME[0]}" + Function_PATH="${Function_PATH}/${Function_Name}" + ###################################################### git flow hotfix list 2> /dev/null ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" - #################################################### - - ############### Stack_TRACE_BUILDER ################ - Function_PATH="$( dirname ${Function_PATH} )" - #################################################### + #################################################### } # temporarily wrap __git_find_on_cmdline() for backwards compatibility diff --git a/completion/available/gradle.completion.bash b/completion/available/gradle.completion.bash index eb2578ab..288b32e6 100644 --- a/completion/available/gradle.completion.bash +++ b/completion/available/gradle.completion.bash @@ -46,7 +46,7 @@ function __gradle-init-cache-dir() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - cache_dir="$HOME/.gradle/completion" + cache_dir="${HOME}/.gradle/completion" mkdir -p ${cache_dir} ############### Stack_TRACE_BUILDER ################ @@ -64,11 +64,10 @@ function __gradle-set-build-file() # Look for default build script in the settings file (settings.gradle by default) # Otherwise, default is the file 'build.gradle' in the current directory. gradle_build_file="$project_root_dir/build.gradle" - if [[ -f "$project_root_dir/settings.gradle" ]] + if [[ -f "${project_root_dir}/settings.gradle" ]] then - local build_file_name=$(grep "^rootProject\.buildFileName" "$project_root_dir/settings.gradle" | \ - sed -n -e "s/rootProject\.buildFileName = [\'\"]\(.*\)[\'\"]/\1/p") - gradle_build_file="$project_root_dir/${build_file_name:-build.gradle}" + local build_file_name=$(grep "^rootProject\.buildFileName" "${project_root_dir}/settings.gradle" | sed -n -e "s/rootProject\.buildFileName = [\'\"]\(.*\)[\'\"]/\1/p") + gradle_build_file="${project_root_dir}/${build_file_name:-build.gradle}" fi ############### Stack_TRACE_BUILDER ################ @@ -84,7 +83,7 @@ function __gradle-set-cache-name() ###################################################### # Cache name is constructed from the absolute path of the build file. - cache_name=$(echo $gradle_build_file | sed -e 's/\//_/g') + cache_name=$(echo ${gradle_build_file} | sed -e 's/\//_/g') ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -101,12 +100,12 @@ function __gradle-set-files-checksum() # Cache MD5 sum of all Gradle scripts and modified timestamps if _command_exists md5 then - gradle_files_checksum=$(md5 -q -s "$(cat "$cache_dir/$cache_name" | xargs ls -o 2>/dev/null)") + gradle_files_checksum=$(md5 -q -s "$(cat "${cache_dir}/${cache_name}" | xargs ls -o 2>/dev/null)") elif _command_exists md5sum then - gradle_files_checksum=$(cat "$cache_dir/$cache_name" | xargs ls -o 2>/dev/null | md5sum | awk '{print $1}') + gradle_files_checksum=$(cat "${cache_dir}/${cache_name}" | xargs ls -o 2>/dev/null | md5sum | awk '{print $1}') else - echo "Cannot generate completions as neither md5 nor md5sum exist on \$PATH" + echo "Cannot generate completions as neither md5 nor md5sum exist on \${path}" fi ############### Stack_TRACE_BUILDER ################ @@ -125,11 +124,11 @@ function __gradle-generate-script-cache() local cache_ttl_mins=${GRADLE_CACHE_TTL_MINUTES:-30240} local script_exclude_pattern=${GRADLE_COMPLETION_EXCLUDE_PATTERN:-"/(build|integTest|out)/"} - if [[ ! $(find $cache_dir/$cache_name -mmin -$cache_ttl_mins 2>/dev/null) ]] + if [[ ! $(find ${cache_dir}/${cache_name} -mmin -${cache_ttl_mins} 2>/dev/null) ]] then # Cache all Gradle scripts - local gradle_build_scripts=$(find $project_root_dir -type f -name "*.gradle" -o -name "*.gradle.kts" 2>/dev/null | grep -E -v "$script_exclude_pattern") - printf "%s\n" "${gradle_build_scripts[@]}" > $cache_dir/$cache_name + local gradle_build_scripts=$(find ${project_root_dir} -type f -name "*.gradle" -o -name "*.gradle.kts" 2>/dev/null | grep -E -v "${script_exclude_pattern}") + printf "%s\n" "${gradle_build_scripts[@]}" > ${cache_dir}/${cache_name} fi ############### Stack_TRACE_BUILDER ################ @@ -297,8 +296,9 @@ function __gradle-generate-tasks-cache() local -a gradle_all_tasks=() local -a root_tasks=() local -a subproject_tasks=() - for output_line in $gradle_tasks_output; do - if [[ $output_line =~ ^([[:lower:]][[:alnum:][:punct:]]*)([[:space:]]-[[:space:]]([[:print:]]*))? ]] + for output_line in $gradle_tasks_output + do + if [[ ${output_line} =~ ^([[:lower:]][[:alnum:][:punct:]]*)([[:space:]]-[[:space:]]([[:print:]]*))? ]] then task_name="${BASH_REMATCH[1]}" task_description="${BASH_REMATCH[3]}" diff --git a/completion/available/grunt.completion.bash b/completion/available/grunt.completion.bash index 3ad925e9..a3194880 100644 --- a/completion/available/grunt.completion.bash +++ b/completion/available/grunt.completion.bash @@ -50,9 +50,9 @@ function _grunt_gruntfile() local curpath="$PWD" while [[ "$curpath" ]]; do for gruntfile in "$curpath/"{G,g}runtfile.{js,coffee}; do - if [[ -e "$gruntfile" ]] + if [[ -e "${gruntfile}" ]] then - echo "$gruntfile" + echo "${gruntfile}" return fi done @@ -79,12 +79,12 @@ function _grunt_completions() # The current grunt version, available tasks, options, etc. local gruntinfo="$(grunt --version --verbose 2>/dev/null)" # Options and tasks. - local opts="$(echo "$gruntinfo" | awk '/Available options: / {$1=$2=""; print $0}')" - local compls="$(echo "$gruntinfo" | awk '/Available tasks: / {$1=$2=""; print $0}')" + local opts="$(echo "${gruntinfo}" | awk '/Available options: / {$1=$2=""; print $0}')" + local compls="$(echo "${gruntinfo}" | awk '/Available tasks: / {$1=$2=""; print $0}')" # Only add -- or - options if the user has started typing - - [[ "$cur" == -* ]] && compls="$compls $opts" + [[ "${cur}" == -* ]] && compls="${compls} ${opts}" # Tell complete what stuff to show. - COMPREPLY=($(compgen -W "$compls" -- "$cur")) + COMPREPLY=($(compgen -W "${compls}" -- "${cur}")) ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" diff --git a/completion/available/hub.completion.bash b/completion/available/hub.completion.bash index 93717a42..65ae66e5 100644 --- a/completion/available/hub.completion.bash +++ b/completion/available/hub.completion.bash @@ -78,17 +78,17 @@ EOF Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local i c=2 s=-s sh shells="bash zsh sh ksh csh fish" - while [ $c -lt $cword ] + while [ $c -lt ${cword} ] do i="${words[c]}" - case "$i" in + case "${i}" in -s) unset s ;; *) for sh in ${shells} do - if [ "$sh" = "$i" ] + if [ "${sh}" = "${i}" ] then unset shells break @@ -175,7 +175,7 @@ EOF unset u ;; *) - if [ -z "$rev" ] + if [ -z "${rev}" ] then # Even though the logic below is able to complete both user/repo # and revision in the right place, when there is only one argument @@ -217,9 +217,9 @@ EOF else for i in $(__hub_github_repos) do - remote=${i%%:*} - repo=${i#*:} - owner=${repo%%/*} + remote="${i%%:*}" + repo="${i#*:}" + owner="${repo%%/*}" if [ "$user" = "$owner" ] then break @@ -229,11 +229,11 @@ EOF else for i in $(__hub_github_repos) do - remote=${i%%:*} - repo=${i#*:} - owner=${repo%%/*} - case "$arg_repo" in - "$repo"|"$owner") + remote="${i%%:*}" + repo="${i#*:}" + owner="${repo%%/*}" + case "${arg_repo}" in + "${repo}"|"${owner}") break ;; esac @@ -250,12 +250,12 @@ EOF *) if [ -z "${arg_repo}${rev}" ] then - __gitcomp "$u $(__hub_github_repos '\o\n\p') $(__hub_revlist ${remote})" - elif [ -z "$rev" ] + __gitcomp "${u} $(__hub_github_repos '\o\n\p') $(__hub_revlist ${remote})" + elif [ -z "${rev}" ] then - __gitcomp "$u $(__hub_revlist ${remote})" + __gitcomp "${u} $(__hub_revlist ${remote})" else - __gitcomp "$u" + __gitcomp "${u}" fi ;; esac @@ -273,24 +273,24 @@ EOF Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### local i c=2 name repo flags="-p -d -h" - while [ $c -lt $cword ] + while [ $c -lt ${cword} ] do i="${words[c]}" case "$i" in -d|-h) ((c++)) - flags=${flags/$i/} + flags=${flags/${i}/} ;; -p) - flags=${flags/$i/} + flags=${flags/${i}/} ;; *) - name=$i + name=${i} ;; esac ((c++)) done - if [ -z "$name" ] + if [ -z "${name}" ] then repo="$(basename "${PWD}")" fi @@ -463,7 +463,7 @@ EOF Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - local f format=$1 + local f format="${1}" if [ -z "$(__gitdir)" ] then return diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash index e3107eac..55a85b49 100644 --- a/completion/available/knife.completion.bash +++ b/completion/available/knife.completion.bash @@ -8,7 +8,7 @@ ### feel free to change those constants # the dir where to store the cache (must be writable and readable by the current user) # must be an absolute path -_KNIFE_AUTOCOMPLETE_CACHE_DIR="$HOME/.knife_autocomplete_cache" +_KNIFE_AUTOCOMPLETE_CACHE_DIR="${HOME}/.knife_autocomplete_cache" # the maximum # of _seconds_ after which a cache will be considered stale # (a cache is refreshed whenever it is used! this is only for caches that might not have been used for a long time) # WARNING: keep that value > 100 diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash index ac8e26d9..3fff7d40 100644 --- a/completion/available/ssh.completion.bash +++ b/completion/available/ssh.completion.bash @@ -18,8 +18,8 @@ _sshcomplete() fi # parse all defined hosts from .ssh/config and files included there - for fl in "$HOME/.ssh/config" \ - $(grep "^\s*Include" "$HOME/.ssh/config" | + for fl in "${HOME}/.ssh/config" \ + $(grep "^\s*Include" "${HOME}/.ssh/config" | awk '{for (i=2; i<=NF; i++) print $i}' | sed -Ee "s|^([^/~])|$HOME/.ssh/\1|" -e "s|^~/|$HOME/|") do @@ -30,11 +30,11 @@ _sshcomplete() done # parse all hosts found in .ssh/known_hosts - if [ -r "$HOME/.ssh/known_hosts" ] + if [ -r "${HOME}/.ssh/known_hosts" ] then - if grep -v -q -e '^ ssh-rsa' "$HOME/.ssh/known_hosts" + if grep -v -q -e '^ ssh-rsa' "${HOME}/.ssh/known_hosts" then - COMPREPLY=( ${COMPREPLY[@]} $(compgen -W "$( awk '{print $1}' "$HOME/.ssh/known_hosts" | grep -v ^\| | cut -d, -f 1 | sed -e 's/\[//g' | sed -e 's/\]//g' | cut -d: -f1 | grep -v ssh-rsa)" ${OPTIONS}) ) + COMPREPLY=( ${COMPREPLY[@]} $(compgen -W "$( awk '{print $1}' "${HOME}/.ssh/known_hosts" | grep -v ^\| | cut -d, -f 1 | sed -e 's/\[//g' | sed -e 's/\]//g' | cut -d: -f1 | grep -v ssh-rsa)" ${OPTIONS}) ) fi fi diff --git a/completion/available/vagrant.completion.bash b/completion/available/vagrant.completion.bash index 88d7ff2c..9af7c6dc 100644 --- a/completion/available/vagrant.completion.bash +++ b/completion/available/vagrant.completion.bash @@ -88,7 +88,7 @@ function _vagrant() then case "$prev" in "init") - local box_list=$(find "$HOME/.vagrant.d/boxes" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;|sed -e 's/-VAGRANTSLASH-/\//') + local box_list=$(find "${HOME}/.vagrant.d/boxes" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;|sed -e 's/-VAGRANTSLASH-/\//') COMPREPLY=($(compgen -W "${box_list}" -- ${cur})) return 0 ;; @@ -151,7 +151,7 @@ function _vagrant() "box") case "$prev" in "remove"|"repackage") - local box_list=$(find "$HOME/.vagrant.d/boxes" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;|sed -e 's/-VAGRANTSLASH-/\//') + local box_list=$(find "${HOME}/.vagrant.d/boxes" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;|sed -e 's/-VAGRANTSLASH-/\//') COMPREPLY=($(compgen -W "${box_list}" -- ${cur})) return 0 ;; diff --git a/completion/available/virtualbox.completion.bash b/completion/available/virtualbox.completion.bash index 0641d97f..be93cd26 100644 --- a/completion/available/virtualbox.completion.bash +++ b/completion/available/virtualbox.completion.bash @@ -80,7 +80,7 @@ function __vboxmanage_list_vms() then SEPARATOR=" " else - SEPARATOR=$1 + SEPARATOR="${1}" fi for VM in $(vboxmanage list vms | cut -d' ' -f1 | tr -d '"'); do @@ -106,7 +106,7 @@ function __vboxmanage_list_runningvms() then SEPARATOR=" " else - SEPARATOR=$1 + SEPARATOR="${1}" fi for VM in $(vboxmanage list runningvms | cut -d' ' -f1 | tr -d '"'); do diff --git a/docs/development.rst b/docs/development.rst index 4e965ff1..657dba82 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -52,7 +52,7 @@ The main ``bash_it.sh`` script loads the frameworks individual components in the * Custom ``aliases`` * Custom ``plugins`` * Custom ``completions`` -* Additional custom files from either ``$BASH_IT/custom`` or ``$BASH_IT_CUSTOM`` +* Additional custom files from either ``${BASH_IT}/custom`` or ``$BASH_IT_CUSTOM`` This order is subject to change. @@ -62,7 +62,7 @@ Individual Component Load Order For ``aliases``\ , ``plugins`` and ``completions``\ , the following rules are applied that influence the load order: -* There is a global ``enabled`` directory, which the enabled components are linked into. Enabled plugins are symlinked from ``$BASH_IT/plugins/available`` to ``$BASH_IT/enabled`` for example. All component types are linked into the same common ``$BASH_IT/enabled`` directory. +* There is a global ``enabled`` directory, which the enabled components are linked into. Enabled plugins are symlinked from ``${BASH_IT}/plugins/available`` to ``${BASH_IT}/enabled`` for example. All component types are linked into the same common ``${BASH_IT}/enabled`` directory. * Within the common ``enabled`` directories, the files are loaded in alphabetical order, which is based on the item's load priority (see next item). * When enabling a component, a *load priority* is assigned to the file. The following default priorities are used: diff --git a/docs/proxy_support.rst b/docs/proxy_support.rst index 86caf36a..e32f6807 100644 --- a/docs/proxy_support.rst +++ b/docs/proxy_support.rst @@ -27,7 +27,7 @@ The following backends are currently supported (in addition to the shell's envir The ``proxy`` plugin changes the configuration files of these tools to enable or disable the proxy settings. Bash-it uses the following variables to set the shell's proxy settings when you call ``enable-proxy``. -These variables are best defined in a custom script in Bash-it's custom script folder (\ ``$BASH_IT/custom``\ ), e.g. ``$BASH_IT/custom/proxy.env.bash`` +These variables are best defined in a custom script in Bash-it's custom script folder (\ ``${BASH_IT}/custom``\ ), e.g. ``${BASH_IT}/custom/proxy.env.bash`` * ``BASH_IT_HTTP_PROXY`` and `BASH_IT_HTTPS_PROXY`: Define the proxy URL to be used, e.g. 'http://localhost:1234' diff --git a/docs/themes-list/barbuk.rst b/docs/themes-list/barbuk.rst index ed805db2..5b21fa2c 100644 --- a/docs/themes-list/barbuk.rst +++ b/docs/themes-list/barbuk.rst @@ -76,7 +76,7 @@ Define your custom glyphs before sourcing bash-it: .. code-block:: bash export BARBUK_GITHUB_CHAR='•' - source "$BASH_IT"/bash_it.sh + source "${BASH_IT}"/bash_it.sh SSH prompt ---------- @@ -96,7 +96,7 @@ can use the short hostname format with ``BARBUK_HOST_INFO``. export BARBUK_HOST_INFO=short # true or false export BARBUK_SSH_INFO=false - source "$BASH_IT"/bash_it.sh + source "${BASH_IT}"/bash_it.sh Keep theme with sudoer ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/themes-list/codeword.rst b/docs/themes-list/codeword.rst index e3d0ae3e..18863873 100644 --- a/docs/themes-list/codeword.rst +++ b/docs/themes-list/codeword.rst @@ -23,6 +23,6 @@ Examples .. code-block:: bash user@example.lan:~ $ cd /tmp/foo/bar/baz - user@example.lan:/tmp/foo/bar/baz $ cd $HOME/workspace + user@example.lan:/tmp/foo/bar/baz $ cd ${HOME}/workspace user@example.lan:~/workspace $ cd sampleRepo/ user@example.lan:~/workspace/sampleRepo [± |master ↑1 ↓3 {1} S:2 ?:1 ✗|] $ diff --git a/docs/themes.rst b/docs/themes.rst index 6d3f4a17..6578c26e 100644 --- a/docs/themes.rst +++ b/docs/themes.rst @@ -3,9 +3,9 @@ Themes ------ -There are over 50+ Bash-it themes to pick from in ``$BASH_IT/themes``. +There are over 50+ Bash-it themes to pick from in ``${BASH_IT}/themes``. The default theme is ``bobby``. -Set ``BASH_IT_THEME`` to the theme name you want, or if you've developed your own custom theme outside of ``$BASH_IT/themes``\ , +Set ``BASH_IT_THEME`` to the theme name you want, or if you've developed your own custom theme outside of ``${BASH_IT}/themes``\ , point the ``BASH_IT_THEME`` variable directly to the theme file. To disable theming completely, leave the variable empty. diff --git a/install.sh b/install.sh index 0a8e425d..b1c63504 100755 --- a/install.sh +++ b/install.sh @@ -31,9 +31,9 @@ function _bash-it_load_one() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - file_type=$1 + file_type="${1}" file_to_enable=$2 - mkdir -p "$BASH_IT/${file_type}/enabled" + mkdir -p "${BASH_IT}/${file_type}/enabled" dest="${BASH_IT}/${file_type}/enabled/${file_to_enable}" if [ ! -e "${dest}" ] @@ -56,18 +56,20 @@ function _bash-it_load_some() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - file_type=$1 - single_type=$(echo "$file_type" | sed -e "s/aliases$/alias/g" | sed -e "s/plugins$/plugin/g") + file_type="${1}" + single_type=$(echo "${file_type}" | sed -e "s/aliases$/alias/g" | sed -e "s/plugins$/plugin/g") enable_func="_enable-$single_type" - [ -d "$BASH_IT/$file_type/enabled" ] || mkdir "$BASH_IT/$file_type/enabled" - for path in "$BASH_IT/${file_type}/available/"[^_]*; do - file_name=$(basename "$path") - while true; do + [ -d "${BASH_IT}/${file_type}/enabled" ] || mkdir "${BASH_IT}/${file_type}/enabled" + for path in "${BASH_IT}/${file_type}/available/"[^_]* + do + file_name=$(basename "${path}") + while true + do just_the_name="${file_name%%.*}" - read -r -e -n 1 -p "Would you like to enable the $just_the_name $file_type? [y/N] " RESP + read -r -e -n 1 -p "Would you like to enable the ${just_the_name} ${file_type}? [y/N] " RESP case $RESP in [yY]) - $enable_func "$just_the_name" + $enable_func "${just_the_name}" break ;; [nN] | "") @@ -93,9 +95,9 @@ function _bash-it_backup() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - test -w "$HOME/$CONFIG_FILE" \ - && cp -aL "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.bak" \ - && echo -e "\033[0;32mYour original $CONFIG_FILE has been backed up to $CONFIG_FILE.bak\033[0m" + test -w "${HOME}/${CONFIG_FILE}" \ + && cp -aL "${HOME}/${CONFIG_FILE}" "${HOME}/${CONFIG_FILE}.bak" \ + && echo -e "\033[0;32mYour original ${CONFIG_FILE} has been backed up to ${CONFIG_FILE}.bak\033[0m" ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -111,8 +113,8 @@ function _bash-it_backup_new() ###################################################### _bash-it_backup - sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" > "$HOME/$CONFIG_FILE" - echo -e "\033[0;32mCopied the template $CONFIG_FILE into ~/$CONFIG_FILE, edit this file to customize bash-it\033[0m" + sed "s|{{BASH_IT}}|$BASH_IT|" "${BASH_IT}/template/bash_profile.template.bash" > "${HOME}/$CONFIG_FILE" + echo -e "\033[0;32mCopied the template ${CONFIG_FILE} into ~/$CONFIG_FILE, edit this file to customize bash-it\033[0m" ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -127,8 +129,8 @@ function _bash-it_backup_append() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### _bash-it_backup - (sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" | tail -n +2) >> "$HOME/$CONFIG_FILE" - echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m" + (sed "s|{{BASH_IT}}|${BASH_IT}|" "${BASH_IT}/template/bash_profile.template.bash" | tail -n +2) >> "${HOME}/${CONFIG_FILE}" + echo -e "\033[0;32mBash-it template has been added to your ${CONFIG_FILE}\033[0m" ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" @@ -142,7 +144,7 @@ function _bash-it_check_for_backup() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - if ! [[ -e "$HOME/$BACKUP_FILE" ]] + if ! [[ -e "${HOME}/${BACKUP_FILE}" ]] then return fi @@ -151,7 +153,7 @@ function _bash-it_check_for_backup() if [[ -z "${overwrite_backup}" ]] then while [[ -z "${silent}" ]]; do - read -e -n 1 -r -p "Would you like to overwrite the existing backup? This will delete your existing backup file ($HOME/$BACKUP_FILE) [y/N] " RESP + read -e -n 1 -r -p "Would you like to overwrite the existing backup? This will delete your existing backup file (${HOME}/${BACKUP_FILE}) [y/N] " RESP case $RESP in [yY]) overwrite_backup=true @@ -195,8 +197,8 @@ function _bash-it_modify_config_files() if [[ -z "${silent}" ]] then while [[ -z "${append_to_config}" ]]; do - read -e -n 1 -r -p "Would you like to keep your $CONFIG_FILE and append bash-it templates at the end? [y/N] " choice - case $choice in + read -e -n 1 -r -p "Would you like to keep your ${CONFIG_FILE} and append bash-it templates at the end? [y/N] " choice + case ${choice} in [yY]) append_to_config=true break @@ -239,7 +241,7 @@ done OPTIND=1 while getopts "hsinaf" opt; do - case "$opt" in + case "${opt}" in "h") _bash-it_show_usage exit 0 @@ -274,14 +276,14 @@ BASH_IT="$(cd "${BASH_SOURCE%/*}" && pwd)" case $OSTYPE in darwin*) - CONFIG_FILE=.bash_profile + CONFIG_FILE=".bash_profile" ;; *) - CONFIG_FILE=.bashrc + CONFIG_FILE=".bashrc" ;; esac -BACKUP_FILE=$CONFIG_FILE.bak +BACKUP_FILE=${CONFIG_FILE}.bak echo "Installing bash-it" if [[ -z "${no_modify_config}" ]] then @@ -292,20 +294,20 @@ fi export BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE='' # Load dependencies for enabling components # shellcheck disable=SC1090 -source "${BASH_IT}"/vendor/github.com/erichs/composure/composure.sh +source "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh" # shellcheck source=./lib/utilities.bash -source "$BASH_IT/lib/utilities.bash" +source "${BASH_IT}/lib/utilities.bash" # shellcheck source=./lib/log.bash source "${BASH_IT}/lib/log.bash" cite _about _param _example _group _author _version # shellcheck source=./lib/helpers.bash -source "$BASH_IT/lib/helpers.bash" +source "${BASH_IT}/lib/helpers.bash" -if [[ -n $interactive && -z "${silent}" ]] +if [[ -n ${interactive} && -z "${silent}" ]] then for type in "aliases" "plugins" "completion"; do echo -e "\033[0;32mEnabling ${type}\033[0m" - _bash-it_load_some "$type" + _bash-it_load_some "${type}" done else echo "" @@ -315,7 +317,7 @@ fi echo "" echo -e "\033[0;32mInstallation finished successfully! Enjoy bash-it!\033[0m" # shellcheck disable=SC2086 -echo -e "\033[0;32mTo start using it, open a new tab or 'source "~/$CONFIG_FILE"'.\033[0m" +echo -e "\033[0;32mTo start using it, open a new tab or 'source "~/${CONFIG_FILE}"'.\033[0m" echo "" echo "To show the available aliases/completions/plugins, type one of the following:" echo " bash-it show aliases" diff --git a/lib/helpers.bash b/lib/helpers.bash index 5c125312..956df4b0 100644 --- a/lib/helpers.bash +++ b/lib/helpers.bash @@ -528,7 +528,7 @@ function _bash-it-migrate() migrated_something=false for file_type in "aliases" "plugins" "completion"; do - for _bash_it_config_file in "${BASH_IT}/$file_type/enabled"/*.bash; do + for _bash_it_config_file in "${BASH_IT}/${file_type}/enabled"/*.bash; do [[ -f "$_bash_it_config_file" ]] || continue # Get the type of component from the extension @@ -1271,7 +1271,7 @@ function _enable-thing() then for _bash_it_config_file in "${BASH_IT}/${subdirectory}/available"/*.bash; do to_enable="${_bash_it_config_file##*/}" - _enable-thing "$subdirectory" "$file_type" "${to_enable%."${file_type/alias/aliases}".bash}" "${load_priority}" + _enable-thing "$subdirectory" "${file_type}" "${to_enable%."${file_type/alias/aliases}".bash}" "${load_priority}" done else to_enables=("${BASH_IT}/$subdirectory/available/${file_entity}.${suffix}.bash") @@ -1499,8 +1499,8 @@ function pathmunge() ###################################################### about 'prevent duplicate directories in your PATH variable' group 'helpers' - example 'pathmunge /path/to/dir is equivalent to PATH=/path/to/dir:$PATH' - example 'pathmunge /path/to/dir after is equivalent to PATH=$PATH:/path/to/dir' + example 'pathmunge /path/to/dir is equivalent to PATH=/path/to/dir:${PATH}' + example 'pathmunge /path/to/dir after is equivalent to PATH=${PATH}:/path/to/dir' if [[ -d "${1:-}" && ! ${PATH} =~ (^|:)"${1}"($|:) ]] then @@ -1508,7 +1508,7 @@ function pathmunge() then export PATH="${PATH}:${1}" else - export PATH="${1}:$PATH" + export PATH="${1}:${PATH}" fi fi diff --git a/plugins/available/basher.plugin.bash b/plugins/available/basher.plugin.bash index 4986a907..f3a1f5b9 100644 --- a/plugins/available/basher.plugin.bash +++ b/plugins/available/basher.plugin.bash @@ -6,9 +6,9 @@ about-plugin 'initializes basher, the shell package manager' if ! _command_exists basher then - if [[ -x "$HOME/.basher/bin/basher" ]] + if [[ -x "${HOME}/.basher/bin/basher" ]] then - pathmunge "$HOME/.basher/bin" + pathmunge "${HOME}/.basher/bin" else _log_warning 'basher not found' return 0 diff --git a/plugins/available/colors.plugin.bash b/plugins/available/colors.plugin.bash index f92626a4..5b753c8d 100644 --- a/plugins/available/colors.plugin.bash +++ b/plugins/available/colors.plugin.bash @@ -20,7 +20,7 @@ function __make_ansi() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift echo -e "\[\e[$("__$next" "${@}")m\]" @@ -35,7 +35,7 @@ function __make_echo() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift echo -e "\033[$("__$next" "${@}")m" @@ -50,7 +50,7 @@ function __reset() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "0${out:+;${out}}" @@ -66,7 +66,7 @@ function __bold() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "${out:+${out};}1" @@ -82,7 +82,7 @@ function __faint() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "${out:+${out};}2" @@ -98,7 +98,7 @@ function __italic() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "${out:+${out};}3" @@ -114,7 +114,7 @@ function __underline() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "${out:+${out};}4" @@ -130,7 +130,7 @@ function __negative() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "${out:+${out};}7" @@ -142,7 +142,7 @@ function __crossed() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "${out:+${out};}8" @@ -313,7 +313,7 @@ function __color_rgb() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - r=$1 && g=$2 && b=$3 + r="${1}" && g="${2}" && b=$3 [[ $r == "$g" && $g == "$b" ]] && echo $((r / 11 + 232)) && return # gray range above 232 echo "8;5;$(((r * 36 + b * 6 + g) / 51 + 16))" ############### Stack_TRACE_BUILDER ################ @@ -347,7 +347,7 @@ function __color() [[ $color == "rgb" ]] && rgb="$1 $2 $3" shift 3 - next=$1 + next="${1}" shift out="$("__$next" "${@}")" echo "$("__color_${mode}_${side}" "$("__color_${color}" "$rgb")")${out:+;${out}}" @@ -480,7 +480,7 @@ function __color_parse() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - next=$1 + next="${1}" shift echo "$("__$next" "${@}")" ############### Stack_TRACE_BUILDER ################ diff --git a/plugins/available/explain.plugin.bash b/plugins/available/explain.plugin.bash index dc57fb57..0a06aac8 100644 --- a/plugins/available/explain.plugin.bash +++ b/plugins/available/explain.plugin.bash @@ -21,7 +21,7 @@ function explain () echo "Bye!" elif [ "$#" -eq 1 ] then - curl -Gs "https://www.mankier.com/api/explain/?cols="$(tput cols) --data-urlencode "q=$1" + curl -Gs "https://www.mankier.com/api/explain/?cols="$(tput cols) --data-urlencode "q="${1}"" else echo "Usage" echo "explain interactive mode." diff --git a/plugins/available/gif.plugin.bash b/plugins/available/gif.plugin.bash index d407188f..523bdcf0 100644 --- a/plugins/available/gif.plugin.bash +++ b/plugins/available/gif.plugin.bash @@ -112,7 +112,7 @@ function v2gif() shift ;; -w | --width) - maxsize="-vf scale=$2:-1" + maxsize="-vf scale="${2}":-1" maxwidthski="-W $2" giftag="${giftag}-w$2" shift 2 @@ -124,7 +124,7 @@ function v2gif() ;; -l | --lossy) # Use giflossy parameter - lossiness="--lossy=$2" + lossiness="--lossy="${2}"" giftag="${giftag}-l$2" shift 2 ;; diff --git a/plugins/available/git.plugin.bash b/plugins/available/git.plugin.bash index 34751659..229ab0bc 100644 --- a/plugins/available/git.plugin.bash +++ b/plugins/available/git.plugin.bash @@ -287,10 +287,10 @@ function git_stats { git log ${LOGOPTS} --all --numstat --format="%n" --author="${a}" | cut -f3 | sort -iu | wc -l echo -n "Number of lines added: " # shellcheck disable=SC2086 - git log ${LOGOPTS} --all --numstat --format="%n" --author="${a}" | cut -f1 | awk '{s+=$1} END {print s}' + git log ${LOGOPTS} --all --numstat --format="%n" --author="${a}" | cut -f1 | awk '{s+="${1}"} END {print s}' echo -n "Number of lines deleted: " # shellcheck disable=SC2086 - git log ${LOGOPTS} --all --numstat --format="%n" --author="${a}" | cut -f2 | awk '{s+=$1} END {print s}' + git log ${LOGOPTS} --all --numstat --format="%n" --author="${a}" | cut -f2 | awk '{s+="${1}"} END {print s}' echo -n "Number of merges: " # shellcheck disable=SC2086 git log ${LOGOPTS} --all --merges --author="${a}" | grep -c '^commit' diff --git a/plugins/available/gitstatus.plugin.bash b/plugins/available/gitstatus.plugin.bash index a6c5a117..ff03c767 100644 --- a/plugins/available/gitstatus.plugin.bash +++ b/plugins/available/gitstatus.plugin.bash @@ -24,7 +24,7 @@ function gitstatus_on_disable() # non-interactive shell [[ $- == *i* ]] || return -: "${SCM_GIT_GITSTATUS_DIR:="$HOME/gitstatus"}" +: "${SCM_GIT_GITSTATUS_DIR:="${HOME}/gitstatus"}" if [[ -d ${SCM_GIT_GITSTATUS_DIR} ]] then source "${SCM_GIT_GITSTATUS_DIR}/gitstatus.plugin.sh" diff --git a/plugins/available/goenv.plugin.bash b/plugins/available/goenv.plugin.bash index 62279d39..f53a0754 100644 --- a/plugins/available/goenv.plugin.bash +++ b/plugins/available/goenv.plugin.bash @@ -13,7 +13,7 @@ about-plugin 'load goenv, if you are using it' # - Check if installed manually to $HOME _command_exists goenv \ || [[ -n "$GOENV_ROOT" && -x "$GOENV_ROOT/bin/goenv" ]] \ - || [[ -x "$HOME/.goenv/bin/goenv" ]] \ + || [[ -x "${HOME}/.goenv/bin/goenv" ]] \ || return 0 # Set GOENV_ROOT, if not already set diff --git a/plugins/available/jekyll.plugin.bash b/plugins/available/jekyll.plugin.bash index 4d3d900a..7d888e57 100644 --- a/plugins/available/jekyll.plugin.bash +++ b/plugins/available/jekyll.plugin.bash @@ -346,7 +346,7 @@ function deploysite() # Load the Jekyll config -if [[ -s "$HOME/.jekyllconfig" ]] +if [[ -s "${HOME}/.jekyllconfig" ]] then - source "$HOME/.jekyllconfig" + source "${HOME}/.jekyllconfig" fi diff --git a/plugins/available/jenv.plugin.bash b/plugins/available/jenv.plugin.bash index 773a9921..e6e97e26 100644 --- a/plugins/available/jenv.plugin.bash +++ b/plugins/available/jenv.plugin.bash @@ -7,7 +7,7 @@ about-plugin 'load jenv, if you are using it' # - Check if installed manually to $HOME _command_exists jenv || [[ -n "$JENV_ROOT" && -x "$JENV_ROOT/bin/jenv" ]] || - [[ -x "$HOME/.jenv/bin/jenv" ]] || + [[ -x "${HOME}/.jenv/bin/jenv" ]] || return # Set JENV_ROOT, if not already set diff --git a/plugins/available/nodenv.plugin.bash b/plugins/available/nodenv.plugin.bash index d3c61323..7eb82c4a 100644 --- a/plugins/available/nodenv.plugin.bash +++ b/plugins/available/nodenv.plugin.bash @@ -2,7 +2,7 @@ cite about-plugin about-plugin 'load nodenv, if you are using it' -export NODENV_ROOT="$HOME/.nodenv" +export NODENV_ROOT="${HOME}/.nodenv" pathmunge "$NODENV_ROOT/bin" if _command_exists nodenv diff --git a/plugins/available/pack.plugin.bash b/plugins/available/pack.plugin.bash index 349b45e6..718914db 100644 --- a/plugins/available/pack.plugin.bash +++ b/plugins/available/pack.plugin.bash @@ -44,7 +44,7 @@ function __pack_index_of_word() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - local w word=$1 + local w word="${1}" shift index=0 for w in "${@}"; do @@ -65,7 +65,7 @@ function __pack_contains_word() Function_Name="${FUNCNAME[0]}" Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### - local w word=$1; shift + local w word="${1}"; shift for w in "${@}"; do [[ $w = "$word" ]] && return done diff --git a/plugins/available/pipsi.plugin.bash b/plugins/available/pipsi.plugin.bash index 916d86d2..799f01b5 100644 --- a/plugins/available/pipsi.plugin.bash +++ b/plugins/available/pipsi.plugin.bash @@ -1,7 +1,7 @@ cite about-plugin about-plugin 'load pipsi, if you are using it' -if [[ -f "$HOME/.local/bin/pipsi" ]] +if [[ -f "${HOME}/.local/bin/pipsi" ]] then pathmunge ~/.local/bin fi diff --git a/plugins/available/proxy.plugin.bash b/plugins/available/proxy.plugin.bash index e3846d14..610a22db 100644 --- a/plugins/available/proxy.plugin.bash +++ b/plugins/available/proxy.plugin.bash @@ -118,8 +118,8 @@ Bash-it provides support for enabling/disabling proxy settings for various shell The following backends are currently supported (in addition to the shell's environment variables): Git, SVN, npm, ssh Bash-it uses the following variables to set the shell's proxy settings when you call 'enable-proxy'. -These variables are best defined in a custom script in bash-it's custom script folder ('$BASH_IT/custom'), -e.g. '$BASH_IT/custom/proxy.env.bash' +These variables are best defined in a custom script in bash-it's custom script folder ('${BASH_IT}/custom'), +e.g. '${BASH_IT}/custom/proxy.env.bash' * BASH_IT_HTTP_PROXY and BASH_IT_HTTPS_PROXY: Define the proxy URL to be used, e.g. 'http://localhost:1234' * BASH_IT_NO_PROXY: A comma-separated list of proxy exclusions, e.g. '127.0.0.1,localhost' diff --git a/plugins/available/pyenv.plugin.bash b/plugins/available/pyenv.plugin.bash index f5fe7c1e..59f4047c 100644 --- a/plugins/available/pyenv.plugin.bash +++ b/plugins/available/pyenv.plugin.bash @@ -13,7 +13,7 @@ about-plugin 'load pyenv, if you are using it' # - Check if installed manually to $HOME _command_exists pyenv \ || [[ -n "$PYENV_ROOT" && -x "$PYENV_ROOT/bin/pyenv" ]] \ - || [[ -x "$HOME/.pyenv/bin/pyenv" ]] \ + || [[ -x "${HOME}/.pyenv/bin/pyenv" ]] \ || return 0 # Set PYENV_ROOT, if not already set diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash index 415df1e1..c91f9656 100644 --- a/plugins/available/rbenv.plugin.bash +++ b/plugins/available/rbenv.plugin.bash @@ -2,7 +2,7 @@ cite about-plugin about-plugin 'load rbenv, if you are using it' -export RBENV_ROOT="$HOME/.rbenv" +export RBENV_ROOT="${HOME}/.rbenv" pathmunge "$RBENV_ROOT/bin" if _command_exists rbenv diff --git a/plugins/available/rvm.plugin.bash b/plugins/available/rvm.plugin.bash index 232b7948..7ea84f40 100644 --- a/plugins/available/rvm.plugin.bash +++ b/plugins/available/rvm.plugin.bash @@ -3,7 +3,7 @@ cite about-plugin about-plugin 'load rvm, if you are using it' -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" +[[ -s "${HOME}/.rvm/scripts/rvm" ]] && source "${HOME}/.rvm/scripts/rvm" # Check to make sure that RVM is actually loaded before adding # the customizations to it. diff --git a/plugins/available/tmuxinator.plugin.bash b/plugins/available/tmuxinator.plugin.bash index e0dc28f0..f6d45da9 100644 --- a/plugins/available/tmuxinator.plugin.bash +++ b/plugins/available/tmuxinator.plugin.bash @@ -1,4 +1,4 @@ cite about-plugin about-plugin 'sources tmuxinator script if available' -[[ -s "$HOME/.tmuxinator/scripts/tmuxinator" ]] && . "$HOME/.tmuxinator/scripts/tmuxinator" +[[ -s "${HOME}/.tmuxinator/scripts/tmuxinator" ]] && . "${HOME}/.tmuxinator/scripts/tmuxinator" diff --git a/plugins/available/z_autoenv.plugin.bash b/plugins/available/z_autoenv.plugin.bash index 18480c8e..c3d490c3 100644 --- a/plugins/available/z_autoenv.plugin.bash +++ b/plugins/available/z_autoenv.plugin.bash @@ -14,7 +14,7 @@ function autoenv_init() ###################################################### typeset target home _file typeset -a _files - target=$1 + target="${1}" home="${HOME%/*}" _files=( $( diff --git a/scripts/reloader.bash b/scripts/reloader.bash index 694dc9fc..9cd1a75b 100644 --- a/scripts/reloader.bash +++ b/scripts/reloader.bash @@ -10,7 +10,7 @@ if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]] then case $1 in alias | completion | plugin) - _bash_it_reloader_type=$1 + _bash_it_reloader_type="${1}" _log_debug "Loading enabled $1 components..." ;; '' | *) @@ -18,7 +18,7 @@ if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]] ;; esac - for _bash_it_reloader_file in "$BASH_IT/enabled"/*"${_bash_it_reloader_type}.bash"; do + for _bash_it_reloader_file in "${BASH_IT}/enabled"/*"${_bash_it_reloader_type}.bash"; do if [[ -e "${_bash_it_reloader_file}" ]] then _bash-it-log-prefix-by-path "${_bash_it_reloader_file}" @@ -32,12 +32,12 @@ if [[ "${1:-}" != "skip" ]] && [[ -d "${BASH_IT?}/enabled" ]] done fi -if [[ -n "${2:-}" ]] && [[ -d "$BASH_IT/${2}/enabled" ]] +if [[ -n "${2:-}" ]] && [[ -d "${BASH_IT}/${2}/enabled" ]] then case $2 in aliases | completion | plugins) _log_warning "Using legacy enabling for $2, please update your bash-it version and migrate" - for _bash_it_reloader_file in "$BASH_IT/${2}/enabled"/*.bash; do + for _bash_it_reloader_file in "${BASH_IT}/${2}/enabled"/*.bash; do if [[ -e "$_bash_it_reloader_file" ]] then _bash-it-log-prefix-by-path "${_bash_it_reloader_file}" diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash index 3def2866..89b47c02 100755 --- a/template/bash_profile.template.bash +++ b/template/bash_profile.template.bash @@ -44,7 +44,7 @@ export TODO="t" # Set this to false to turn off version control status checking within the prompt for all themes export SCM_CHECK=true # Set to actual location of gitstatus directory if installed -#export SCM_GIT_GITSTATUS_DIR="$HOME/gitstatus" +#export SCM_GIT_GITSTATUS_DIR="${HOME}/gitstatus" # per default gitstatus uses 2 times as many threads as CPU cores, you can change this here if you must #export GITSTATUS_NUM_THREADS=8 @@ -81,4 +81,4 @@ export SCM_CHECK=true # export BASH_IT_RELOAD_LEGACY=1 # Load Bash It -source "$BASH_IT"/bash_it.sh +source "${BASH_IT}"/bash_it.sh diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats index b638b392..5da48e19 100644 --- a/test/bash_it/bash_it.bats +++ b/test/bash_it/bash_it.bats @@ -17,27 +17,27 @@ function local_setup_file() } @test "bash-it: verify that the test fixture is available" { - assert_file_exist "$BASH_IT/aliases/available/a.aliases.bash" - assert_file_exist "$BASH_IT/aliases/available/b.aliases.bash" + assert_file_exist "${BASH_IT}/aliases/available/a.aliases.bash" + assert_file_exist "${BASH_IT}/aliases/available/b.aliases.bash" } @test "bash-it: load aliases in order" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/150---a.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/aliases/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/aliases/enabled/150---a.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/aliases/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---b.aliases.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -45,22 +45,22 @@ function local_setup_file() } @test "bash-it: load aliases in priority order" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/175---a.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/175---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/aliases/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/aliases/enabled/175---a.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/175---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/aliases/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---b.aliases.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -68,24 +68,24 @@ function local_setup_file() } @test "bash-it: load aliases and plugins in priority order" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/150---a.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/aliases/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---b.aliases.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/plugins/enabled/250---c.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/aliases/enabled/150---a.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/aliases/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/plugins/enabled/250---c.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---c.plugin.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -93,25 +93,25 @@ function local_setup_file() } @test "bash-it: load aliases, plugins and completions in priority order" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled - mkdir -p $BASH_IT/completion/enabled + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled + mkdir -p ${BASH_IT}/completion/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/150---a.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/completion/enabled/350---b.completion.bash - assert_link_exist "$BASH_IT/completion/enabled/350---b.completion.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/plugins/enabled/250---c.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/aliases/enabled/150---a.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/completion/enabled/350---b.completion.bash + assert_link_exist "${BASH_IT}/completion/enabled/350---b.completion.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/plugins/enabled/250---c.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---c.plugin.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -120,25 +120,25 @@ function local_setup_file() } @test "bash-it: load aliases, plugins and completions in priority order, even if the priority says otherwise" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled - mkdir -p $BASH_IT/completion/enabled + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled + mkdir -p ${BASH_IT}/completion/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/450---a.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/450---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/completion/enabled/350---b.completion.bash - assert_link_exist "$BASH_IT/completion/enabled/350---b.completion.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/plugins/enabled/950---c.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/950---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/aliases/enabled/450---a.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/450---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/completion/enabled/350---b.completion.bash + assert_link_exist "${BASH_IT}/completion/enabled/350---b.completion.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/plugins/enabled/950---c.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/950---c.plugin.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -147,24 +147,24 @@ function local_setup_file() } @test "bash-it: load aliases and plugins in priority order, with one alias higher than plugins" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/aliases/enabled/350---a.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/350---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/aliases/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---b.aliases.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/plugins/enabled/250---c.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/aliases/enabled/350---a.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/350---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/aliases/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/plugins/enabled/250---c.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---c.plugin.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -174,21 +174,21 @@ function local_setup_file() } @test "bash-it: load global aliases in order" { - mkdir -p $BASH_IT/enabled + mkdir -p ${BASH_IT}/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/enabled/150---a.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/enabled/150---a.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---b.aliases.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -196,21 +196,21 @@ function local_setup_file() } @test "bash-it: load global aliases in priority order" { - mkdir -p $BASH_IT/enabled + mkdir -p ${BASH_IT}/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/enabled/175---a.aliases.bash - assert_link_exist "$BASH_IT/enabled/175---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/enabled/175---a.aliases.bash + assert_link_exist "${BASH_IT}/enabled/175---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---b.aliases.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -218,23 +218,23 @@ function local_setup_file() } @test "bash-it: load global aliases and plugins in priority order" { - mkdir -p $BASH_IT/enabled + mkdir -p ${BASH_IT}/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/enabled/150---a.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---b.aliases.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/enabled/250---c.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/enabled/150---a.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/enabled/250---c.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---c.plugin.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -242,23 +242,23 @@ function local_setup_file() } @test "bash-it: load global aliases and plugins in priority order, with one alias higher than plugins" { - mkdir -p $BASH_IT/enabled + mkdir -p ${BASH_IT}/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/enabled/350---a.aliases.bash - assert_link_exist "$BASH_IT/enabled/350---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---b.aliases.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/enabled/250---c.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/enabled/350---a.aliases.bash + assert_link_exist "${BASH_IT}/enabled/350---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/enabled/250---c.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---c.plugin.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -268,27 +268,27 @@ function local_setup_file() } @test "bash-it: load global aliases and plugins in priority order, individual old directories are loaded later" { - mkdir -p $BASH_IT/enabled - mkdir -p $BASH_IT/aliases/enabled + mkdir -p ${BASH_IT}/enabled + mkdir -p ${BASH_IT}/aliases/enabled - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" - ln -s $BASH_IT/aliases/available/a.aliases.bash $BASH_IT/enabled/350---a.aliases.bash - assert_link_exist "$BASH_IT/enabled/350---a.aliases.bash" - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---b.aliases.bash" - ln -s $BASH_IT/plugins/available/c.plugin.bash $BASH_IT/enabled/250---c.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---c.plugin.bash" + ln -s ${BASH_IT}/aliases/available/a.aliases.bash ${BASH_IT}/enabled/350---a.aliases.bash + assert_link_exist "${BASH_IT}/enabled/350---a.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/plugins/available/c.plugin.bash ${BASH_IT}/enabled/250---c.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---c.plugin.bash" # Add one file in the old directory structure - ln -s $BASH_IT/aliases/available/b.aliases.bash $BASH_IT/aliases/enabled/150---b.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---b.aliases.bash" + ln -s ${BASH_IT}/aliases/available/b.aliases.bash ${BASH_IT}/aliases/enabled/150---b.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---b.aliases.bash" # The `test_alias` alias should not exist run alias test_alias &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias test_alias &> /dev/null assert_success @@ -298,53 +298,53 @@ function local_setup_file() } @test "bash-it: load enabled aliases from new structure, priority-based" { - mkdir -p $BASH_IT/enabled - ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/enabled/150---atom.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---atom.aliases.bash" - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" + mkdir -p ${BASH_IT}/enabled + ln -s ${BASH_IT}/aliases/available/atom.aliases.bash ${BASH_IT}/enabled/150---atom.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---atom.aliases.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" # The `ah` alias should not exist run alias ah &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias ah &> /dev/null assert_success } @test "bash-it: load enabled aliases from old structure, priority-based" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled - ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/150---atom.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---atom.aliases.bash" - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/250---base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---base.plugin.bash" + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled + ln -s ${BASH_IT}/aliases/available/atom.aliases.bash ${BASH_IT}/aliases/enabled/150---atom.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---atom.aliases.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/250---base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---base.plugin.bash" # The `ah` alias should not exist run alias ah &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias ah &> /dev/null assert_success } @test "bash-it: load enabled aliases from old structure, without priorities" { - mkdir -p $BASH_IT/aliases/enabled - mkdir -p $BASH_IT/plugins/enabled - ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/atom.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/atom.aliases.bash" - ln -s $BASH_IT/plugins/available/base.plugin.bash $BASH_IT/plugins/enabled/base.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/base.plugin.bash" + mkdir -p ${BASH_IT}/aliases/enabled + mkdir -p ${BASH_IT}/plugins/enabled + ln -s ${BASH_IT}/aliases/available/atom.aliases.bash ${BASH_IT}/aliases/enabled/atom.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/atom.aliases.bash" + ln -s ${BASH_IT}/plugins/available/base.plugin.bash ${BASH_IT}/plugins/enabled/base.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/base.plugin.bash" # The `ah` alias should not exist run alias ah &> /dev/null assert_failure - load "$BASH_IT/bash_it.sh" + load "${BASH_IT}/bash_it.sh" run alias ah &> /dev/null assert_success diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats index b4d6ebde..34f7ba1e 100755 --- a/test/completion/bash-it.completion.bats +++ b/test/completion/bash-it.completion.bats @@ -171,99 +171,99 @@ function __check_completion () } @test "completion bash-it: disable - provide the a* aliases when atom is enabled with the old location and name" { - ln -s "$BASH_IT/aliases/available/atom.aliases.bash" "$BASH_IT/aliases/enabled/atom.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/atom.aliases.bash" + ln -s "${BASH_IT}/aliases/available/atom.aliases.bash" "${BASH_IT}/aliases/enabled/atom.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/atom.aliases.bash" - ln -s "$BASH_IT/completion/available/apm.completion.bash" "$BASH_IT/completion/enabled/apm.completion.bash" - assert_link_exist "$BASH_IT/completion/enabled/apm.completion.bash" + ln -s "${BASH_IT}/completion/available/apm.completion.bash" "${BASH_IT}/completion/enabled/apm.completion.bash" + assert_link_exist "${BASH_IT}/completion/enabled/apm.completion.bash" run __check_completion 'bash-it disable alias a' assert_line -n 0 "all atom" } @test "completion bash-it: disable - provide the a* aliases when atom is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/aliases/available/atom.aliases.bash" "$BASH_IT/aliases/enabled/150---atom.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/150---atom.aliases.bash" + ln -s "${BASH_IT}/aliases/available/atom.aliases.bash" "${BASH_IT}/aliases/enabled/150---atom.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/150---atom.aliases.bash" - ln -s "$BASH_IT/completion/available/apm.completion.bash" "$BASH_IT/completion/enabled/350---apm.completion.bash" - assert_link_exist "$BASH_IT/completion/enabled/350---apm.completion.bash" + ln -s "${BASH_IT}/completion/available/apm.completion.bash" "${BASH_IT}/completion/enabled/350---apm.completion.bash" + assert_link_exist "${BASH_IT}/completion/enabled/350---apm.completion.bash" run __check_completion 'bash-it disable alias a' assert_line -n 0 "all atom" } @test "completion bash-it: disable - provide the a* aliases when atom is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/aliases/available/atom.aliases.bash" "$BASH_IT/enabled/150---atom.aliases.bash" - assert_link_exist "$BASH_IT/enabled/150---atom.aliases.bash" + ln -s "${BASH_IT}/aliases/available/atom.aliases.bash" "${BASH_IT}/enabled/150---atom.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---atom.aliases.bash" - ln -s "$BASH_IT/completion/available/apm.completion.bash" "$BASH_IT/enabled/350---apm.completion.bash" - assert_link_exist "$BASH_IT/enabled/350---apm.completion.bash" + ln -s "${BASH_IT}/completion/available/apm.completion.bash" "${BASH_IT}/enabled/350---apm.completion.bash" + assert_link_exist "${BASH_IT}/enabled/350---apm.completion.bash" run __check_completion 'bash-it disable alias a' assert_line -n 0 "all atom" } @test "completion bash-it: disable - provide the docker-machine plugin when docker-machine is enabled with the old location and name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/aliases/enabled/docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/aliases/enabled/docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/docker-compose.aliases.bash" - ln -s "$BASH_IT/plugins/available/docker-machine.plugin.bash" "$BASH_IT/plugins/enabled/docker-machine.plugin.bash" - assert_link_exist "$BASH_IT/plugins/enabled/docker-machine.plugin.bash" + ln -s "${BASH_IT}/plugins/available/docker-machine.plugin.bash" "${BASH_IT}/plugins/enabled/docker-machine.plugin.bash" + assert_link_exist "${BASH_IT}/plugins/enabled/docker-machine.plugin.bash" run __check_completion 'bash-it disable plugin docker' assert_line -n 0 "docker-machine" } @test "completion bash-it: disable - provide the docker-machine plugin when docker-machine is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" - ln -s "$BASH_IT/plugins/available/docker-machine.plugin.bash" "$BASH_IT/plugins/enabled/350---docker-machine.plugin.bash" - assert_link_exist "$BASH_IT/plugins/enabled/350---docker-machine.plugin.bash" + ln -s "${BASH_IT}/plugins/available/docker-machine.plugin.bash" "${BASH_IT}/plugins/enabled/350---docker-machine.plugin.bash" + assert_link_exist "${BASH_IT}/plugins/enabled/350---docker-machine.plugin.bash" run __check_completion 'bash-it disable plugin docker' assert_line -n 0 "docker-machine" } @test "completion bash-it: disable - provide the docker-machine plugin when docker-machine is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/enabled/150---docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/enabled/150---docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/enabled/150---docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---docker-compose.aliases.bash" - ln -s "$BASH_IT/plugins/available/docker-machine.plugin.bash" "$BASH_IT/enabled/350---docker-machine.plugin.bash" - assert_link_exist "$BASH_IT/enabled/350---docker-machine.plugin.bash" + ln -s "${BASH_IT}/plugins/available/docker-machine.plugin.bash" "${BASH_IT}/enabled/350---docker-machine.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/350---docker-machine.plugin.bash" run __check_completion 'bash-it disable plugin docker' assert_line -n 0 "docker-machine" } @test "completion bash-it: disable - provide the todo.txt-cli aliases when todo plugin is enabled with the old location and name" { - ln -s "$BASH_IT/aliases/available/todo.txt-cli.aliases.bash" "$BASH_IT/aliases/enabled/todo.txt-cli.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/todo.txt-cli.aliases.bash" + ln -s "${BASH_IT}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT}/aliases/enabled/todo.txt-cli.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/todo.txt-cli.aliases.bash" - ln -s "$BASH_IT/plugins/available/todo.plugin.bash" "$BASH_IT/plugins/enabled/todo.plugin.bash" - assert_link_exist "$BASH_IT/plugins/enabled/todo.plugin.bash" + ln -s "${BASH_IT}/plugins/available/todo.plugin.bash" "${BASH_IT}/plugins/enabled/todo.plugin.bash" + assert_link_exist "${BASH_IT}/plugins/enabled/todo.plugin.bash" run __check_completion 'bash-it disable alias to' assert_line -n 0 "todo.txt-cli" } @test "completion bash-it: disable - provide the todo.txt-cli aliases when todo plugin is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/aliases/available/todo.txt-cli.aliases.bash" "$BASH_IT/aliases/enabled/150---todo.txt-cli.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/150---todo.txt-cli.aliases.bash" + ln -s "${BASH_IT}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT}/aliases/enabled/150---todo.txt-cli.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/150---todo.txt-cli.aliases.bash" - ln -s "$BASH_IT/plugins/available/todo.plugin.bash" "$BASH_IT/plugins/enabled/350---todo.plugin.bash" - assert_link_exist "$BASH_IT/plugins/enabled/350---todo.plugin.bash" + ln -s "${BASH_IT}/plugins/available/todo.plugin.bash" "${BASH_IT}/plugins/enabled/350---todo.plugin.bash" + assert_link_exist "${BASH_IT}/plugins/enabled/350---todo.plugin.bash" run __check_completion 'bash-it disable alias to' assert_line -n 0 "todo.txt-cli" } @test "completion bash-it: disable - provide the todo.txt-cli aliases when todo plugin is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/aliases/available/todo.txt-cli.aliases.bash" "$BASH_IT/enabled/150---todo.txt-cli.aliases.bash" - assert_link_exist "$BASH_IT/enabled/150---todo.txt-cli.aliases.bash" + ln -s "${BASH_IT}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT}/enabled/150---todo.txt-cli.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---todo.txt-cli.aliases.bash" - ln -s "$BASH_IT/plugins/available/todo.plugin.bash" "$BASH_IT/enabled/350---todo.plugin.bash" - assert_link_exist "$BASH_IT/enabled/350---todo.plugin.bash" + ln -s "${BASH_IT}/plugins/available/todo.plugin.bash" "${BASH_IT}/enabled/350---todo.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/350---todo.plugin.bash" run __check_completion 'bash-it disable alias to' assert_line -n 0 "todo.txt-cli" @@ -280,96 +280,96 @@ function __check_completion () } @test "completion bash-it: enable - provide the a* aliases when atom is enabled with the old location and name" { - ln -s "$BASH_IT/aliases/available/atom.aliases.bash" "$BASH_IT/aliases/enabled/atom.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/atom.aliases.bash" + ln -s "${BASH_IT}/aliases/available/atom.aliases.bash" "${BASH_IT}/aliases/enabled/atom.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/atom.aliases.bash" run __check_completion 'bash-it enable alias a' assert_line -n 0 "all ag ansible apt" } @test "completion bash-it: enable - provide the a* aliases when atom is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/aliases/available/atom.aliases.bash" "$BASH_IT/aliases/enabled/150---atom.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/150---atom.aliases.bash" + ln -s "${BASH_IT}/aliases/available/atom.aliases.bash" "${BASH_IT}/aliases/enabled/150---atom.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/150---atom.aliases.bash" run __check_completion 'bash-it enable alias a' assert_line -n 0 "all ag ansible apt" } @test "completion bash-it: enable - provide the a* aliases when atom is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/aliases/available/atom.aliases.bash" "$BASH_IT/enabled/150---atom.aliases.bash" - assert_link_exist "$BASH_IT/enabled/150---atom.aliases.bash" + ln -s "${BASH_IT}/aliases/available/atom.aliases.bash" "${BASH_IT}/enabled/150---atom.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---atom.aliases.bash" run __check_completion 'bash-it enable alias a' assert_line -n 0 "all ag ansible apt" } @test "completion bash-it: enable - provide the docker* plugins when docker-compose is enabled with the old location and name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/aliases/enabled/docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/aliases/enabled/docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/docker-compose.aliases.bash" run __check_completion 'bash-it enable plugin docker' assert_line -n 0 "docker docker-compose docker-machine" } @test "completion bash-it: enable - provide the docker-* plugins when docker-compose is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" run __check_completion 'bash-it enable plugin docker' assert_line -n 0 "docker docker-compose docker-machine" } @test "completion bash-it: enable - provide the docker-* plugins when docker-compose is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/enabled/150---docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/enabled/150---docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/enabled/150---docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---docker-compose.aliases.bash" run __check_completion 'bash-it enable plugin docker' assert_line -n 0 "docker docker-compose docker-machine" } @test "completion bash-it: enable - provide the docker* completions when docker-compose is enabled with the old location and name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/aliases/enabled/docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/aliases/enabled/docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/docker-compose.aliases.bash" run __check_completion 'bash-it enable completion docker' assert_line -n 0 "docker docker-compose docker-machine" } @test "completion bash-it: enable - provide the docker* completions when docker-compose is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" run __check_completion 'bash-it enable completion docker' assert_line -n 0 "docker docker-compose docker-machine" } @test "completion bash-it: enable - provide the docker* completions when docker-compose is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/aliases/available/docker-compose.aliases.bash" "$BASH_IT/enabled/150---docker-compose.aliases.bash" - assert_link_exist "$BASH_IT/enabled/150---docker-compose.aliases.bash" + ln -s "${BASH_IT}/aliases/available/docker-compose.aliases.bash" "${BASH_IT}/enabled/150---docker-compose.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---docker-compose.aliases.bash" run __check_completion 'bash-it enable completion docker' assert_line -n 0 "docker docker-compose docker-machine" } @test "completion bash-it: enable - provide the todo.txt-cli aliases when todo plugin is enabled with the old location and name" { - ln -s "$BASH_IT/plugins/available/todo.plugin.bash" "$BASH_IT/plugins/enabled/todo.plugin.bash" - assert_link_exist "$BASH_IT/plugins/enabled/todo.plugin.bash" + ln -s "${BASH_IT}/plugins/available/todo.plugin.bash" "${BASH_IT}/plugins/enabled/todo.plugin.bash" + assert_link_exist "${BASH_IT}/plugins/enabled/todo.plugin.bash" run __check_completion 'bash-it enable alias to' assert_line -n 0 "todo.txt-cli" } @test "completion bash-it: enable - provide the todo.txt-cli aliases when todo plugin is enabled with the old location and priority-based name" { - ln -s "$BASH_IT/plugins/available/todo.plugin.bash" "$BASH_IT/plugins/enabled/350---todo.plugin.bash" - assert_link_exist "$BASH_IT/plugins/enabled/350---todo.plugin.bash" + ln -s "${BASH_IT}/plugins/available/todo.plugin.bash" "${BASH_IT}/plugins/enabled/350---todo.plugin.bash" + assert_link_exist "${BASH_IT}/plugins/enabled/350---todo.plugin.bash" run __check_completion 'bash-it enable alias to' assert_line -n 0 "todo.txt-cli" } @test "completion bash-it: enable - provide the todo.txt-cli aliases when todo plugin is enabled with the new location and priority-based name" { - ln -s "$BASH_IT/plugins/available/todo.plugin.bash" "$BASH_IT/enabled/350---todo.plugin.bash" - assert_link_exist "$BASH_IT/enabled/350---todo.plugin.bash" + ln -s "${BASH_IT}/plugins/available/todo.plugin.bash" "${BASH_IT}/enabled/350---todo.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/350---todo.plugin.bash" run __check_completion 'bash-it enable alias to' assert_line -n 0 "todo.txt-cli" diff --git a/test/install/install.bats b/test/install/install.bats index 988721b1..e4236d7c 100644 --- a/test/install/install.bats +++ b/test/install/install.bats @@ -36,42 +36,42 @@ function local_setup_file() } @test "install: verify that the install script exists" { - assert_file_exist "$BASH_IT/install.sh" + assert_file_exist "${BASH_IT}/install.sh" } @test "install: run the install script silently" { - cd "$BASH_IT" + cd "${BASH_IT}" ./install.sh --silent - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE" - assert_link_exist "$BASH_IT/enabled/150---general.aliases.bash" - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" - assert_link_exist "$BASH_IT/enabled/800---aliases.completion.bash" - assert_link_exist "$BASH_IT/enabled/350---bash-it.completion.bash" - assert_link_exist "$BASH_IT/enabled/325---system.completion.bash" + assert_link_exist "${BASH_IT}/enabled/150---general.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/800---aliases.completion.bash" + assert_link_exist "${BASH_IT}/enabled/350---bash-it.completion.bash" + assert_link_exist "${BASH_IT}/enabled/325---system.completion.bash" } @test "install: verify that a backup file is created" { - cd "$BASH_IT" + cd "${BASH_IT}" - touch "$HOME/$BASH_IT_CONFIG_FILE" - echo "test file content" > "$HOME/$BASH_IT_CONFIG_FILE" - local md5_orig=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}') + touch "${HOME}/$BASH_IT_CONFIG_FILE" + echo "test file content" > "${HOME}/$BASH_IT_CONFIG_FILE" + local md5_orig=$(md5sum "${HOME}/$BASH_IT_CONFIG_FILE" | awk '{print $1}') ./install.sh --silent - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE" - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE.bak" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE.bak" - local md5_bak=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}') + local md5_bak=$(md5sum "${HOME}/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}') assert_equal "$md5_orig" "$md5_bak" } @test "install: verify that silent and interactive can not be used at the same time" { - cd "$BASH_IT" + cd "${BASH_IT}" run ./install.sh --silent --interactive @@ -79,7 +79,7 @@ function local_setup_file() } @test "install: verify that no-modify-config and append-to-config can not be used at the same time" { - cd "$BASH_IT" + cd "${BASH_IT}" run ./install.sh --silent --no-modify-config --append-to-config @@ -87,17 +87,17 @@ function local_setup_file() } @test "install: verify that the template is appended" { - cd "$BASH_IT" + cd "${BASH_IT}" - touch "$HOME/$BASH_IT_CONFIG_FILE" - echo "test file content" > "$HOME/$BASH_IT_CONFIG_FILE" + touch "${HOME}/$BASH_IT_CONFIG_FILE" + echo "test file content" > "${HOME}/$BASH_IT_CONFIG_FILE" ./install.sh --silent --append-to-config - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE" - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE.bak" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE.bak" - run cat "$HOME/$BASH_IT_CONFIG_FILE" + run cat "${HOME}/$BASH_IT_CONFIG_FILE" assert_line "test file content" assert_line "source \"\$BASH_IT\"/bash_it.sh" diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats index 51ca5579..2fe26903 100644 --- a/test/install/uninstall.bats +++ b/test/install/uninstall.bats @@ -36,42 +36,42 @@ function local_setup_file() } @test "uninstall: verify that the uninstall script exists" { - assert_file_exist "$BASH_IT/uninstall.sh" + assert_file_exist "${BASH_IT}/uninstall.sh" } @test "uninstall: run the uninstall script with an existing backup file" { - cd "$BASH_IT" + cd "${BASH_IT}" - echo "test file content for backup" > "$HOME/$BASH_IT_CONFIG_FILE.bak" - echo "test file content for original file" > "$HOME/$BASH_IT_CONFIG_FILE" - local md5_bak=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}') + echo "test file content for backup" > "${HOME}/$BASH_IT_CONFIG_FILE.bak" + echo "test file content for original file" > "${HOME}/$BASH_IT_CONFIG_FILE" + local md5_bak=$(md5sum "${HOME}/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}') run ./uninstall.sh assert_success - assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE.uninstall" - assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE.bak" - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE" + assert_file_not_exist "${HOME}/$BASH_IT_CONFIG_FILE.uninstall" + assert_file_not_exist "${HOME}/$BASH_IT_CONFIG_FILE.bak" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE" - local md5_conf=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}') + local md5_conf=$(md5sum "${HOME}/$BASH_IT_CONFIG_FILE" | awk '{print $1}') assert_equal "$md5_bak" "$md5_conf" } @test "uninstall: run the uninstall script without an existing backup file" { - cd "$BASH_IT" + cd "${BASH_IT}" - echo "test file content for original file" > "$HOME/$BASH_IT_CONFIG_FILE" - local md5_orig=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}') + echo "test file content for original file" > "${HOME}/$BASH_IT_CONFIG_FILE" + local md5_orig=$(md5sum "${HOME}/$BASH_IT_CONFIG_FILE" | awk '{print $1}') run ./uninstall.sh assert_success - assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE.uninstall" - assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE.bak" - assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE" + assert_file_exist "${HOME}/$BASH_IT_CONFIG_FILE.uninstall" + assert_file_not_exist "${HOME}/$BASH_IT_CONFIG_FILE.bak" + assert_file_not_exist "${HOME}/$BASH_IT_CONFIG_FILE" - local md5_uninstall=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE.uninstall" | awk '{print $1}') + local md5_uninstall=$(md5sum "${HOME}/$BASH_IT_CONFIG_FILE.uninstall" | awk '{print $1}') assert_equal "$md5_orig" "$md5_uninstall" } diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats index 62005499..96246744 100644 --- a/test/lib/helpers.bats +++ b/test/lib/helpers.bats @@ -19,7 +19,7 @@ function local_setup() Function_PATH="${Function_PATH}/${Function_Name}" ###################################################### # Copy the test fixture to the Bash-it folder - cp -RP "$BASH_IT/test/fixtures/bash_it"/* "$BASH_IT/" + cp -RP "${BASH_IT}/test/fixtures/bash_it"/* "${BASH_IT}/" ############### Stack_TRACE_BUILDER ################ Function_PATH="$( dirname ${Function_PATH} )" #################################################### @@ -29,8 +29,8 @@ function local_setup() # TODO Create global __get_base_name function # TODO Create global __get_enabled_name function @test "bash-it: verify that the test fixture is available" { - assert_file_exist "$BASH_IT/profiles/test-bad-component.bash_it" - assert_file_exist "$BASH_IT/profiles/test-bad-type.bash_it" + assert_file_exist "${BASH_IT}/profiles/test-bad-component.bash_it" + assert_file_exist "${BASH_IT}/profiles/test-bad-type.bash_it" } @test "helpers: _command_exists function exists" { @@ -89,45 +89,45 @@ function local_setup() } @test "helpers: bash-it help list aliases without any aliases enabled" { - run _help-list-aliases "$BASH_IT/aliases/available/ag.aliases.bash" + run _help-list-aliases "${BASH_IT}/aliases/available/ag.aliases.bash" assert_line -n 0 "ag:" } @test "helpers: bash-it help list aliases with ag aliases enabled" { - ln -s $BASH_IT/aliases/available/ag.aliases.bash $BASH_IT/aliases/enabled/150---ag.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---ag.aliases.bash" + ln -s ${BASH_IT}/aliases/available/ag.aliases.bash ${BASH_IT}/aliases/enabled/150---ag.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---ag.aliases.bash" - run _help-list-aliases "$BASH_IT/aliases/enabled/150---ag.aliases.bash" + run _help-list-aliases "${BASH_IT}/aliases/enabled/150---ag.aliases.bash" assert_line -n 0 "ag:" } @test "helpers: bash-it help list aliases with todo.txt-cli aliases enabled" { - ln -s $BASH_IT/aliases/available/todo.txt-cli.aliases.bash $BASH_IT/aliases/enabled/150---todo.txt-cli.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---todo.txt-cli.aliases.bash" + ln -s ${BASH_IT}/aliases/available/todo.txt-cli.aliases.bash ${BASH_IT}/aliases/enabled/150---todo.txt-cli.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---todo.txt-cli.aliases.bash" - run _help-list-aliases "$BASH_IT/aliases/enabled/150---todo.txt-cli.aliases.bash" + run _help-list-aliases "${BASH_IT}/aliases/enabled/150---todo.txt-cli.aliases.bash" assert_line -n 0 "todo.txt-cli:" } @test "helpers: bash-it help list aliases with docker-compose aliases enabled" { - ln -s $BASH_IT/aliases/available/docker-compose.aliases.bash $BASH_IT/aliases/enabled/150---docker-compose.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" + ln -s ${BASH_IT}/aliases/available/docker-compose.aliases.bash ${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" - run _help-list-aliases "$BASH_IT/aliases/enabled/150---docker-compose.aliases.bash" + run _help-list-aliases "${BASH_IT}/aliases/enabled/150---docker-compose.aliases.bash" assert_line -n 0 "docker-compose:" } @test "helpers: bash-it help list aliases with ag aliases enabled in global directory" { - ln -s $BASH_IT/aliases/available/ag.aliases.bash $BASH_IT/enabled/150---ag.aliases.bash - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + ln -s ${BASH_IT}/aliases/available/ag.aliases.bash ${BASH_IT}/enabled/150---ag.aliases.bash + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" - run _help-list-aliases "$BASH_IT/enabled/150---ag.aliases.bash" + run _help-list-aliases "${BASH_IT}/enabled/150---ag.aliases.bash" assert_line -n 0 "ag:" } @test "helpers: bash-it help aliases one alias enabled in the old directory" { - ln -s $BASH_IT/aliases/available/ag.aliases.bash $BASH_IT/aliases/enabled/150---ag.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/150---ag.aliases.bash" + ln -s ${BASH_IT}/aliases/available/ag.aliases.bash ${BASH_IT}/aliases/enabled/150---ag.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/150---ag.aliases.bash" run bash-it help aliases assert_line -n 0 "ag:" @@ -136,11 +136,11 @@ function local_setup() @test "helpers: bash-it help aliases one alias enabled in global directory" { run bash-it enable alias "ag" assert_line -n 0 'ag enabled with priority 150.' - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" run bash-it enable plugin "aws" assert_line -n 0 'aws enabled with priority 250.' - assert_link_exist "$BASH_IT/enabled/250---aws.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---aws.plugin.bash" run bash-it help aliases assert_line -n 0 "ag:" @@ -150,58 +150,58 @@ function local_setup() @test "helpers: enable the todo.txt-cli aliases through the bash-it function" { run bash-it enable alias "todo.txt-cli" assert_line -n 0 'todo.txt-cli enabled with priority 150.' - assert_link_exist "$BASH_IT/enabled/150---todo.txt-cli.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---todo.txt-cli.aliases.bash" } @test "helpers: enable the curl aliases" { run _enable-alias "curl" assert_line -n 0 'curl enabled with priority 150.' - assert_link_exist "$BASH_IT/enabled/150---curl.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---curl.aliases.bash" } @test "helpers: enable the apm completion through the bash-it function" { run bash-it enable completion "apm" assert_line -n 0 'apm enabled with priority 350.' - assert_link_exist "$BASH_IT/enabled/350---apm.completion.bash" + assert_link_exist "${BASH_IT}/enabled/350---apm.completion.bash" } @test "helpers: enable the brew completion" { run _enable-completion "brew" assert_line -n 0 'brew enabled with priority 375.' - assert_link_exist "$BASH_IT/enabled/375---brew.completion.bash" + assert_link_exist "${BASH_IT}/enabled/375---brew.completion.bash" } @test "helpers: enable the node plugin" { run _enable-plugin "node" assert_line -n 0 'node enabled with priority 250.' - assert_link_exist "$BASH_IT/enabled/250---node.plugin.bash" "../plugins/available/node.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---node.plugin.bash" "../plugins/available/node.plugin.bash" } @test "helpers: enable the node plugin through the bash-it function" { run bash-it enable plugin "node" assert_line -n 0 'node enabled with priority 250.' - assert_link_exist "$BASH_IT/enabled/250---node.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---node.plugin.bash" } @test "helpers: enable the node and nvm plugins through the bash-it function" { run bash-it enable plugin "node" "nvm" assert_line -n 0 'node enabled with priority 250.' assert_line -n 1 'nvm enabled with priority 225.' - assert_link_exist "$BASH_IT/enabled/250---node.plugin.bash" - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---node.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" } @test "helpers: enable the foo-unkown and nvm plugins through the bash-it function" { run bash-it enable plugin "foo-unknown" "nvm" assert_line -n 0 'sorry, foo-unknown does not appear to be an available plugin.' assert_line -n 1 'nvm enabled with priority 225.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" } @test "helpers: enable the nvm plugin" { run _enable-plugin "nvm" assert_line -n 0 'nvm enabled with priority 225.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" } @test "helpers: enable an unknown plugin" { @@ -209,11 +209,11 @@ function local_setup() assert_line -n 0 'sorry, unknown-foo does not appear to be an available plugin.' # Check for both old an new structure - assert [ ! -L "$BASH_IT/plugins/enabled/250---unknown-foo.plugin.bash" ] - assert [ ! -L "$BASH_IT/plugins/enabled/unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/250---unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/unknown-foo.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/250---unknown-foo.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/250---unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/unknown-foo.plugin.bash" ] } @test "helpers: enable an unknown plugin through the bash-it function" { @@ -222,11 +222,11 @@ function local_setup() assert_line -n 0 'sorry, unknown-foo does not appear to be an available plugin.' # Check for both old an new structure - assert [ ! -L "$BASH_IT/plugins/enabled/250---unknown-foo.plugin.bash" ] - assert [ ! -L "$BASH_IT/plugins/enabled/unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/250---unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/unknown-foo.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/250---unknown-foo.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/250---unknown-foo.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/unknown-foo.plugin.bash" ] } @test "helpers: disable a plugin that is not enabled" { @@ -237,75 +237,75 @@ function local_setup() @test "helpers: enable and disable the nvm plugin" { run _enable-plugin "nvm" assert_line -n 0 'nvm enabled with priority 225.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" - assert [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" + assert [ ! -L "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" ] run _disable-plugin "nvm" assert_line -n 0 'nvm disabled.' - assert [ ! -L "$BASH_IT/enabled/225---nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/225---nvm.plugin.bash" ] } @test "helpers: disable the nvm plugin if it was enabled with a priority, but in the component-specific directory" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/225---nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" - assert [ ! -L "$BASH_IT/enabled/225---nvm.plugin.bash" ] + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/225---nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" + assert [ ! -L "${BASH_IT}/enabled/225---nvm.plugin.bash" ] run _disable-plugin "nvm" assert_line -n 0 'nvm disabled.' - assert [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/225---nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/225---nvm.plugin.bash" ] } @test "helpers: disable the nvm plugin if it was enabled without a priority" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" run _disable-plugin "nvm" assert_line -n 0 'nvm disabled.' - assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/nvm.plugin.bash" ] } @test "helpers: enable the nvm plugin if it was enabled without a priority" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" run _enable-plugin "nvm" assert_line -n 0 'nvm is already enabled.' - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" - assert [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/225---nvm.plugin.bash" ] + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" + assert [ ! -L "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/225---nvm.plugin.bash" ] } @test "helpers: enable the nvm plugin if it was enabled with a priority, but in the component-specific directory" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/225---nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/225---nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" run _enable-plugin "nvm" assert_line -n 0 'nvm is already enabled.' - assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] - assert_link_exist "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" - assert [ ! -L "$BASH_IT/enabled/225---nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/nvm.plugin.bash" ] + assert_link_exist "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" + assert [ ! -L "${BASH_IT}/enabled/225---nvm.plugin.bash" ] } @test "helpers: enable the nvm plugin twice" { run _enable-plugin "nvm" assert_line -n 0 'nvm enabled with priority 225.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" run _enable-plugin "nvm" assert_line -n 0 'nvm is already enabled.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" } @test "helpers: profile load command sanity" { run _bash-it-profile-load "default" assert_success - assert_link_exist "$BASH_IT/enabled/150---general.aliases.bash" - assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash" - assert_link_exist "$BASH_IT/enabled/800---aliases.completion.bash" - assert_link_exist "$BASH_IT/enabled/350---bash-it.completion.bash" - assert_link_exist "$BASH_IT/enabled/325---system.completion.bash" + assert_link_exist "${BASH_IT}/enabled/150---general.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/250---base.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/800---aliases.completion.bash" + assert_link_exist "${BASH_IT}/enabled/350---bash-it.completion.bash" + assert_link_exist "${BASH_IT}/enabled/325---system.completion.bash" } @test "helpers: profile save command sanity" { @@ -316,14 +316,14 @@ function local_setup() assert_line -n 1 "Saving completion configuration..." assert_line -n 2 "Saving aliases configuration..." assert_line -n 3 "All done!" - assert_file_exist "$BASH_IT/profiles/test.bash_it" + assert_file_exist "${BASH_IT}/profiles/test.bash_it" } @test "helpers: profile save creates valid file with only plugin enabled" { run _enable-plugin "nvm" run _bash-it-profile-save "test" - run cat "$BASH_IT/profiles/test.bash_it" + run cat "${BASH_IT}/profiles/test.bash_it" assert_line -n 0 "# This file is auto generated by Bash-it. Do not edit manually!" assert_line -n 1 "# plugins" assert_line -n 2 "plugins nvm" @@ -333,7 +333,7 @@ function local_setup() run _enable-completion "bash-it" run _bash-it-profile-save "test" - run cat "$BASH_IT/profiles/test.bash_it" + run cat "${BASH_IT}/profiles/test.bash_it" assert_line -n 0 "# This file is auto generated by Bash-it. Do not edit manually!" assert_line -n 1 "# completion" assert_line -n 2 "completion bash-it" @@ -343,7 +343,7 @@ function local_setup() run _enable-alias "general" run _bash-it-profile-save "test" - run cat "$BASH_IT/profiles/test.bash_it" + run cat "${BASH_IT}/profiles/test.bash_it" assert_line -n 0 "# This file is auto generated by Bash-it. Do not edit manually!" assert_line -n 1 "# aliases" assert_line -n 2 "aliases general" @@ -361,11 +361,11 @@ function local_setup() run _enable-completion "system" run _bash-it-profile-load "test" - assert_link_not_exist "$BASH_IT/enabled/150---general.aliases.bash" - assert_link_not_exist "$BASH_IT/enabled/250---base.plugin.bash" - assert_link_not_exist "$BASH_IT/enabled/800---aliases.completion.bash" - assert_link_not_exist "$BASH_IT/enabled/350---bash-it.completion.bash" - assert_link_not_exist "$BASH_IT/enabled/325---system.completion.bash" + assert_link_not_exist "${BASH_IT}/enabled/150---general.aliases.bash" + assert_link_not_exist "${BASH_IT}/enabled/250---base.plugin.bash" + assert_link_not_exist "${BASH_IT}/enabled/800---aliases.completion.bash" + assert_link_not_exist "${BASH_IT}/enabled/350---bash-it.completion.bash" + assert_link_not_exist "${BASH_IT}/enabled/325---system.completion.bash" } @test "helpers: profile save and load" { @@ -379,9 +379,9 @@ function local_setup() assert_success run _disable-alias "general" - assert_link_not_exist "$BASH_IT/enabled/150---general.aliases.bash" + assert_link_not_exist "${BASH_IT}/enabled/150---general.aliases.bash" run _bash-it-profile-load "test" - assert_link_exist "$BASH_IT/enabled/150---general.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---general.aliases.bash" } @test "helpers: profile load corrupted profile file: bad component" { @@ -396,10 +396,10 @@ function local_setup() @test "helpers: profile rm sanity" { run _bash-it-profile-save "test" - assert_file_exist "$BASH_IT/profiles/test.bash_it" + assert_file_exist "${BASH_IT}/profiles/test.bash_it" run _bash-it-profile-rm "test" assert_line -n 0 "Removed profile 'test' successfully!" - assert_file_not_exist "$BASH_IT/profiles/test.bash_it" + assert_file_not_exist "${BASH_IT}/profiles/test.bash_it" } @test "helpers: profile rm no params" { @@ -415,7 +415,7 @@ function local_setup() @test "helpers: profile rm default" { run _bash-it-profile-rm "default" assert_line -n 0 -p "Can not remove the default profile..." - assert_file_exist "$BASH_IT/profiles/default.bash_it" + assert_file_exist "${BASH_IT}/profiles/default.bash_it" } @test "helpers: profile rm bad profile name" { @@ -442,11 +442,11 @@ function local_setup() } @test "helpers: migrate plugins and completions that share the same name" { - ln -s $BASH_IT/completion/available/dirs.completion.bash $BASH_IT/completion/enabled/350---dirs.completion.bash - assert_link_exist "$BASH_IT/completion/enabled/350---dirs.completion.bash" + ln -s ${BASH_IT}/completion/available/dirs.completion.bash ${BASH_IT}/completion/enabled/350---dirs.completion.bash + assert_link_exist "${BASH_IT}/completion/enabled/350---dirs.completion.bash" - ln -s $BASH_IT/plugins/available/dirs.plugin.bash $BASH_IT/plugins/enabled/250---dirs.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---dirs.plugin.bash" + ln -s ${BASH_IT}/plugins/available/dirs.plugin.bash ${BASH_IT}/plugins/enabled/250---dirs.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---dirs.plugin.bash" run _bash-it-migrate assert_line -n 0 'Migrating plugin dirs.' @@ -457,60 +457,60 @@ function local_setup() assert_line -n 5 'dirs enabled with priority 350.' assert_line -n 6 'If any migration errors were reported, please try the following: reload && bash-it migrate' - assert_link_exist "$BASH_IT/enabled/350---dirs.completion.bash" - assert_link_exist "$BASH_IT/enabled/250---dirs.plugin.bash" - assert [ ! -L "$BASH_IT/completion/enabled/350----dirs.completion.bash" ] - assert [ ! -L "$BASH_IT/plugins/enabled/250----dirs.plugin.bash" ] + assert_link_exist "${BASH_IT}/enabled/350---dirs.completion.bash" + assert_link_exist "${BASH_IT}/enabled/250---dirs.plugin.bash" + assert [ ! -L "${BASH_IT}/completion/enabled/350----dirs.completion.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/250----dirs.plugin.bash" ] } @test "helpers: migrate enabled plugins that don't use the new priority-based configuration" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" - ln -s $BASH_IT/plugins/available/node.plugin.bash $BASH_IT/plugins/enabled/node.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/node.plugin.bash" + ln -s ${BASH_IT}/plugins/available/node.plugin.bash ${BASH_IT}/plugins/enabled/node.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/node.plugin.bash" - ln -s $BASH_IT/aliases/available/todo.txt-cli.aliases.bash $BASH_IT/aliases/enabled/todo.txt-cli.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/todo.txt-cli.aliases.bash" + ln -s ${BASH_IT}/aliases/available/todo.txt-cli.aliases.bash ${BASH_IT}/aliases/enabled/todo.txt-cli.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/todo.txt-cli.aliases.bash" run _enable-plugin "ssh" - assert_link_exist "$BASH_IT/enabled/250---ssh.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---ssh.plugin.bash" run _bash-it-migrate assert_line -n 0 'Migrating alias todo.txt-cli.' assert_line -n 1 'todo.txt-cli disabled.' assert_line -n 2 'todo.txt-cli enabled with priority 150.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" - assert_link_exist "$BASH_IT/enabled/250---node.plugin.bash" - assert_link_exist "$BASH_IT/enabled/250---ssh.plugin.bash" - assert_link_exist "$BASH_IT/enabled/150---todo.txt-cli.aliases.bash" - assert [ ! -L "$BASH_IT/plugins/enabled/node.plugin.bash" ] - assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] - assert [ ! -L "$BASH_IT/aliases/enabled/todo.txt-cli.aliases.bash" ] + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---node.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---ssh.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/150---todo.txt-cli.aliases.bash" + assert [ ! -L "${BASH_IT}/plugins/enabled/node.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/aliases/enabled/todo.txt-cli.aliases.bash" ] } @test "helpers: migrate enabled plugins that use the new priority-based configuration in the individual directories" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/225---nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/225---nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" - ln -s $BASH_IT/plugins/available/node.plugin.bash $BASH_IT/plugins/enabled/250---node.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---node.plugin.bash" + ln -s ${BASH_IT}/plugins/available/node.plugin.bash ${BASH_IT}/plugins/enabled/250---node.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---node.plugin.bash" - ln -s $BASH_IT/aliases/available/todo.txt-cli.aliases.bash $BASH_IT/aliases/enabled/250---todo.txt-cli.aliases.bash - assert_link_exist "$BASH_IT/aliases/enabled/250---todo.txt-cli.aliases.bash" + ln -s ${BASH_IT}/aliases/available/todo.txt-cli.aliases.bash ${BASH_IT}/aliases/enabled/250---todo.txt-cli.aliases.bash + assert_link_exist "${BASH_IT}/aliases/enabled/250---todo.txt-cli.aliases.bash" run _enable-plugin "ssh" - assert_link_exist "$BASH_IT/enabled/250---ssh.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---ssh.plugin.bash" run _bash-it-migrate - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" - assert_link_exist "$BASH_IT/enabled/250---node.plugin.bash" - assert_link_exist "$BASH_IT/enabled/250---ssh.plugin.bash" - assert_link_exist "$BASH_IT/enabled/150---todo.txt-cli.aliases.bash" - assert [ ! -L "$BASH_IT/plugins/enabled/225----node.plugin.bash" ] - assert [ ! -L "$BASH_IT/plugins/enabled/250----nvm.plugin.bash" ] - assert [ ! -L "$BASH_IT/aliases/enabled/250----todo.txt-cli.aliases.bash" ] + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---node.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---ssh.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/150---todo.txt-cli.aliases.bash" + assert [ ! -L "${BASH_IT}/plugins/enabled/225----node.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/250----nvm.plugin.bash" ] + assert [ ! -L "${BASH_IT}/aliases/enabled/250----todo.txt-cli.aliases.bash" ] } @test "helpers: run the migrate command without anything to migrate and nothing enabled" { @@ -519,10 +519,10 @@ function local_setup() @test "helpers: run the migrate command without anything to migrate" { run _enable-plugin "ssh" - assert_link_exist "$BASH_IT/enabled/250---ssh.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---ssh.plugin.bash" run _bash-it-migrate - assert_link_exist "$BASH_IT/enabled/250---ssh.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---ssh.plugin.bash" } function __migrate_all_components() @@ -608,8 +608,8 @@ function __migrate_all_components() } @test "helpers: verify that existing components are automatically migrated when something is enabled" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" run bash-it enable plugin "node" assert_line -n 0 'Migrating plugin nvm.' @@ -617,16 +617,16 @@ function __migrate_all_components() assert_line -n 2 'nvm enabled with priority 225.' assert_line -n 3 'If any migration errors were reported, please try the following: reload && bash-it migrate' assert_line -n 4 'node enabled with priority 250.' - assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" - assert_link_exist "$BASH_IT/enabled/250---node.plugin.bash" + assert [ ! -L "${BASH_IT}/plugins/enabled/nvm.plugin.bash" ] + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/250---node.plugin.bash" } @test "helpers: verify that existing components are automatically migrated when something is disabled" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" - ln -s $BASH_IT/plugins/available/node.plugin.bash $BASH_IT/plugins/enabled/250---node.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---node.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/node.plugin.bash ${BASH_IT}/plugins/enabled/250---node.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---node.plugin.bash" run bash-it disable plugin "node" assert_line -n 0 'Migrating plugin node.' @@ -637,89 +637,89 @@ function __migrate_all_components() assert_line -n 5 'nvm enabled with priority 225.' assert_line -n 6 'If any migration errors were reported, please try the following: reload && bash-it migrate' assert_line -n 7 'node disabled.' - assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" - assert [ ! -L "$BASH_IT/plugins/enabled/250---node.plugin.bash" ] - assert [ ! -L "$BASH_IT/enabled/250---node.plugin.bash" ] + assert [ ! -L "${BASH_IT}/plugins/enabled/nvm.plugin.bash" ] + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" + assert [ ! -L "${BASH_IT}/plugins/enabled/250---node.plugin.bash" ] + assert [ ! -L "${BASH_IT}/enabled/250---node.plugin.bash" ] } @test "helpers: enable all plugins" { run _enable-plugin "all" - local available=$(find $BASH_IT/plugins/available -name *.plugin.bash | wc -l | xargs) - local enabled=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs) + local available=$(find ${BASH_IT}/plugins/available -name *.plugin.bash | wc -l | xargs) + local enabled=$(find ${BASH_IT}/enabled -name [0-9]*.plugin.bash | wc -l | xargs) assert_equal "$available" "$enabled" } @test "helpers: disable all plugins" { run _enable-plugin "all" - local available=$(find $BASH_IT/plugins/available -name *.plugin.bash | wc -l | xargs) - local enabled=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs) + local available=$(find ${BASH_IT}/plugins/available -name *.plugin.bash | wc -l | xargs) + local enabled=$(find ${BASH_IT}/enabled -name [0-9]*.plugin.bash | wc -l | xargs) assert_equal "$available" "$enabled" run _enable-alias "ag" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" run _disable-plugin "all" - local enabled2=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs) + local enabled2=$(find ${BASH_IT}/enabled -name [0-9]*.plugin.bash | wc -l | xargs) assert_equal "0" "$enabled2" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" } @test "helpers: disable all plugins in the old directory structure" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" - ln -s $BASH_IT/plugins/available/node.plugin.bash $BASH_IT/plugins/enabled/node.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/node.plugin.bash" + ln -s ${BASH_IT}/plugins/available/node.plugin.bash ${BASH_IT}/plugins/enabled/node.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/node.plugin.bash" - local enabled=$(find $BASH_IT/plugins/enabled -name *.plugin.bash | wc -l | xargs) + local enabled=$(find ${BASH_IT}/plugins/enabled -name *.plugin.bash | wc -l | xargs) assert_equal "2" "$enabled" run _enable-alias "ag" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" run _disable-plugin "all" - local enabled2=$(find $BASH_IT/plugins/enabled -name *.plugin.bash | wc -l | xargs) + local enabled2=$(find ${BASH_IT}/plugins/enabled -name *.plugin.bash | wc -l | xargs) assert_equal "0" "$enabled2" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" } @test "helpers: disable all plugins in the old directory structure with priority" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/250---nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/250---nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---nvm.plugin.bash" - ln -s $BASH_IT/plugins/available/node.plugin.bash $BASH_IT/plugins/enabled/250---node.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/250---node.plugin.bash" + ln -s ${BASH_IT}/plugins/available/node.plugin.bash ${BASH_IT}/plugins/enabled/250---node.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/250---node.plugin.bash" - local enabled=$(find $BASH_IT/plugins/enabled -name *.plugin.bash | wc -l | xargs) + local enabled=$(find ${BASH_IT}/plugins/enabled -name *.plugin.bash | wc -l | xargs) assert_equal "2" "$enabled" run _enable-alias "ag" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" run _disable-plugin "all" - local enabled2=$(find $BASH_IT/plugins/enabled -name *.plugin.bash | wc -l | xargs) + local enabled2=$(find ${BASH_IT}/plugins/enabled -name *.plugin.bash | wc -l | xargs) assert_equal "0" "$enabled2" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" } @test "helpers: disable all plugins without anything enabled" { - local enabled=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs) + local enabled=$(find ${BASH_IT}/enabled -name [0-9]*.plugin.bash | wc -l | xargs) assert_equal "0" "$enabled" run _enable-alias "ag" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" run _disable-plugin "all" - local enabled2=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs) + local enabled2=$(find ${BASH_IT}/enabled -name [0-9]*.plugin.bash | wc -l | xargs) assert_equal "0" "$enabled2" - assert_link_exist "$BASH_IT/enabled/150---ag.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ag.aliases.bash" } @test "helpers: enable the ansible aliases through the bash-it function" { run bash-it enable alias "ansible" assert_line -n 0 'ansible enabled with priority 150.' - assert_link_exist "$BASH_IT/enabled/150---ansible.aliases.bash" + assert_link_exist "${BASH_IT}/enabled/150---ansible.aliases.bash" } @test "helpers: describe the nvm plugin without enabling it" { @@ -729,21 +729,21 @@ function __migrate_all_components() @test "helpers: describe the nvm plugin after enabling it" { run _enable-plugin "nvm" assert_line -n 0 'nvm enabled with priority 225.' - assert_link_exist "$BASH_IT/enabled/225---nvm.plugin.bash" + assert_link_exist "${BASH_IT}/enabled/225---nvm.plugin.bash" _bash-it-plugins | grep "nvm" | grep "\[x\]" } @test "helpers: describe the nvm plugin after enabling it in the old directory" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/nvm.plugin.bash" _bash-it-plugins | grep "nvm" | grep "\[x\]" } @test "helpers: describe the nvm plugin after enabling it in the old directory with priority" { - ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/225---nvm.plugin.bash - assert_link_exist "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" + ln -s ${BASH_IT}/plugins/available/nvm.plugin.bash ${BASH_IT}/plugins/enabled/225---nvm.plugin.bash + assert_link_exist "${BASH_IT}/plugins/enabled/225---nvm.plugin.bash" _bash-it-plugins | grep "nvm" | grep "\[x\]" } diff --git a/test/plugins/go.plugin.bats b/test/plugins/go.plugin.bats index 5fb11d33..bd4d115a 100644 --- a/test/plugins/go.plugin.bats +++ b/test/plugins/go.plugin.bats @@ -43,47 +43,47 @@ function setup_go_path() @test 'plugins go: single entry in GOPATH' { { _command_exists go && go version &>/dev/null; } || skip 'golang not found' - setup_go_path "$BASH_IT/test/fixtures/go/gopath" + setup_go_path "${BASH_IT}/test/fixtures/go/gopath" load ../../plugins/available/go.plugin - assert_equal "$(cut -d':' -f1 <<<$PATH)" "$BASH_IT/test/fixtures/go/gopath/bin" + assert_equal "$(cut -d':' -f1 <<<$PATH)" "${BASH_IT}/test/fixtures/go/gopath/bin" } @test 'plugins go: single entry in GOPATH, with space' { { _command_exists go && go version &>/dev/null; } || skip 'golang not found' - setup_go_path "$BASH_IT/test/fixtures/go/go path" + setup_go_path "${BASH_IT}/test/fixtures/go/go path" load ../../plugins/available/go.plugin - assert_equal "$(cut -d':' -f1 <<<$PATH)" "$BASH_IT/test/fixtures/go/go path/bin" + assert_equal "$(cut -d':' -f1 <<<$PATH)" "${BASH_IT}/test/fixtures/go/go path/bin" } @test 'plugins go: single entry in GOPATH, with escaped space' { skip 'huh?' { _command_exists go && go version &>/dev/null; } || skip 'golang not found' - setup_go_path "$BASH_IT/test/fixtures/go/go\ path" + setup_go_path "${BASH_IT}/test/fixtures/go/go\ path" load ../../plugins/available/go.plugin - assert_equal "$(cut -d':' -f1 <<<$PATH)" "$BASH_IT/test/fixtures/go/go\ path/bin" + assert_equal "$(cut -d':' -f1 <<<$PATH)" "${BASH_IT}/test/fixtures/go/go\ path/bin" } @test 'plugins go: multiple entries in GOPATH' { { _command_exists go && go version &>/dev/null; } || skip 'golang not found' - setup_go_path "$BASH_IT/test/fixtures/go/gopath" - setup_go_path "$BASH_IT/test/fixtures/go/gopath2" + setup_go_path "${BASH_IT}/test/fixtures/go/gopath" + setup_go_path "${BASH_IT}/test/fixtures/go/gopath2" load ../../plugins/available/go.plugin - assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "$BASH_IT/test/fixtures/go/gopath2/bin:$BASH_IT/test/fixtures/go/gopath/bin" + assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "${BASH_IT}/test/fixtures/go/gopath2/bin:${BASH_IT}/test/fixtures/go/gopath/bin" } @test 'plugins go: multiple entries in GOPATH, with space' { { _command_exists go && go version &>/dev/null; } || skip 'golang not found' - setup_go_path "$BASH_IT/test/fixtures/go/gopath" - setup_go_path "$BASH_IT/test/fixtures/go/go path" + setup_go_path "${BASH_IT}/test/fixtures/go/gopath" + setup_go_path "${BASH_IT}/test/fixtures/go/go path" load ../../plugins/available/go.plugin - assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "$BASH_IT/test/fixtures/go/go path/bin:$BASH_IT/test/fixtures/go/gopath/bin" + assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "${BASH_IT}/test/fixtures/go/go path/bin:${BASH_IT}/test/fixtures/go/gopath/bin" } @test 'plugins go: multiple entries in GOPATH, with escaped space' { skip 'huh?' { _command_exists go && go version &>/dev/null; } || skip 'golang not found' - setup_go_path "$BASH_IT/test/fixtures/go/gopath" - setup_go_path "$BASH_IT/test/fixtures/go/go path" + setup_go_path "${BASH_IT}/test/fixtures/go/gopath" + setup_go_path "${BASH_IT}/test/fixtures/go/go path" load ../../plugins/available/go.plugin - assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "$BASH_IT/test/fixtures/go/go\ path/bin:$BASH_IT/test/fixtures/go/gopath/bin" + assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "${BASH_IT}/test/fixtures/go/go\ path/bin:${BASH_IT}/test/fixtures/go/gopath/bin" } diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats index 4e701fdf..f8d628d8 100644 --- a/test/themes/base.theme.svn.bats +++ b/test/themes/base.theme.svn.bats @@ -39,7 +39,7 @@ function setup_svn_path { repo="$(setup_repo)" pushd "$repo" - setup_svn_path "$BASH_IT/test/fixtures/svn/working" + setup_svn_path "${BASH_IT}/test/fixtures/svn/working" # Init the base theme again so that the working SVN script is detected _bash_it_appearance_scm_init @@ -56,7 +56,7 @@ function setup_svn_path { mkdir foo pushd foo - setup_svn_path "$BASH_IT/test/fixtures/svn/working" + setup_svn_path "${BASH_IT}/test/fixtures/svn/working" # init the base theme again so that the working SVN script is detected _bash_it_appearance_scm_init @@ -72,7 +72,7 @@ function setup_svn_path { rm -rf .svn - setup_svn_path "$BASH_IT/test/fixtures/svn/working" + setup_svn_path "${BASH_IT}/test/fixtures/svn/working" # Init the base theme again so that the working SVN script is detected _bash_it_appearance_scm_init @@ -86,7 +86,7 @@ function setup_svn_path { repo="$(setup_repo)" pushd "$repo" - setup_svn_path "$BASH_IT/test/fixtures/svn/broken" + setup_svn_path "${BASH_IT}/test/fixtures/svn/broken" # Init the base theme again so that the broken SVN script is detected _bash_it_appearance_scm_init @@ -103,7 +103,7 @@ function setup_svn_path { mkdir foo pushd foo - setup_svn_path "$BASH_IT/test/fixtures/svn/broken" + setup_svn_path "${BASH_IT}/test/fixtures/svn/broken" # Init the base theme again so that the broken SVN script is detected _bash_it_appearance_scm_init diff --git a/themes/agnoster/agnoster.theme.bash b/themes/agnoster/agnoster.theme.bash index a24c38ab..1bdeed6e 100644 --- a/themes/agnoster/agnoster.theme.bash +++ b/themes/agnoster/agnoster.theme.bash @@ -253,7 +253,7 @@ function prompt_segment() debug "no current BG, codes is " "${codes[@]}" PR="$PR$(ansi codes[@]) " fi - CURRENT_BG=$1 + CURRENT_BG="${1}" [[ -n $3 ]] && PR="$PR$3" ############### Stack_TRACE_BUILDER ################ @@ -538,7 +538,7 @@ function prompt_right_segment() # debug "no current BG, codes is $codes[@]" # PRIGHT="$PRIGHT$(ansi codes[@]) " # fi - CURRENT_RBG=$1 + CURRENT_RBG="${1}" [[ -n $3 ]] && PRIGHT="$PRIGHT$3" ############### Stack_TRACE_BUILDER ################ diff --git a/themes/doubletime_multiline/doubletime_multiline.theme.bash b/themes/doubletime_multiline/doubletime_multiline.theme.bash index 491bfa84..16ec0ebe 100644 --- a/themes/doubletime_multiline/doubletime_multiline.theme.bash +++ b/themes/doubletime_multiline/doubletime_multiline.theme.bash @@ -1,6 +1,6 @@ # shellcheck shell=bash -source "$BASH_IT/themes/doubletime/doubletime.theme.bash" +source "${BASH_IT}/themes/doubletime/doubletime.theme.bash" function prompt_setter() { diff --git a/themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash b/themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash index 9e377160..4d0a660d 100644 --- a/themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash +++ b/themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash @@ -1,6 +1,6 @@ # shellcheck shell=bash -source "$BASH_IT/themes/doubletime/doubletime.theme.bash" +source "${BASH_IT}/themes/doubletime/doubletime.theme.bash" function prompt_setter() { diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash index 9a68f370..fb8233bd 100644 --- a/themes/gitline/gitline.theme.bash +++ b/themes/gitline/gitline.theme.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -. "$BASH_IT/themes/gitline/powerline.base.bash" +. "${BASH_IT}/themes/gitline/powerline.base.bash" #For the logo(Uncomment if you want a logo before your name) #PROMPT_DISTRO_LOGO="💻" diff --git a/themes/liquidprompt/liquidprompt.theme.bash b/themes/liquidprompt/liquidprompt.theme.bash index e76af9ce..61ddcf91 100644 --- a/themes/liquidprompt/liquidprompt.theme.bash +++ b/themes/liquidprompt/liquidprompt.theme.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Wrapper to use liquidprompt with bashit -targetdir="$BASH_IT/themes/liquidprompt/liquidprompt" +targetdir="${BASH_IT}/themes/liquidprompt/liquidprompt" gray="\[\e[1;90m\]" cwd="$PWD" diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash index d2a10339..5a5b0160 100644 --- a/themes/powerline-multiline/powerline-multiline.base.bash +++ b/themes/powerline-multiline/powerline-multiline.base.bash @@ -1,4 +1,4 @@ -. "$BASH_IT/themes/powerline/powerline.base.bash" +. "${BASH_IT}/themes/powerline/powerline.base.bash" function __powerline_last_status_prompt() { diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash index 48a1243e..61ae41ca 100644 --- a/themes/powerline-multiline/powerline-multiline.theme.bash +++ b/themes/powerline-multiline/powerline-multiline.theme.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -. "$BASH_IT/themes/powerline-multiline/powerline-multiline.base.bash" +. "${BASH_IT}/themes/powerline-multiline/powerline-multiline.base.bash" PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"} POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash index ae046850..1a5ebcbd 100644 --- a/themes/powerline-naked/powerline-naked.base.bash +++ b/themes/powerline-naked/powerline-naked.base.bash @@ -1,4 +1,4 @@ -. "$BASH_IT/themes/powerline/powerline.base.bash" +. "${BASH_IT}/themes/powerline/powerline.base.bash" function __powerline_left_segment() { diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash index 2fb4137e..af085db2 100644 --- a/themes/powerline-naked/powerline-naked.theme.bash +++ b/themes/powerline-naked/powerline-naked.theme.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -. "$BASH_IT/themes/powerline-naked/powerline-naked.base.bash" +. "${BASH_IT}/themes/powerline-naked/powerline-naked.base.bash" PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""} POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} diff --git a/themes/powerline-plain/powerline-plain.base.bash b/themes/powerline-plain/powerline-plain.base.bash index 7a1d8a18..ebaa2f51 100644 --- a/themes/powerline-plain/powerline-plain.base.bash +++ b/themes/powerline-plain/powerline-plain.base.bash @@ -1,4 +1,4 @@ -. "$BASH_IT/themes/powerline/powerline.base.bash" +. "${BASH_IT}/themes/powerline/powerline.base.bash" function __powerline_left_segment() { diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash index 6ff68e8f..1aa514e6 100644 --- a/themes/powerline-plain/powerline-plain.theme.bash +++ b/themes/powerline-plain/powerline-plain.theme.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -. "$BASH_IT/themes/powerline-plain/powerline-plain.base.bash" +. "${BASH_IT}/themes/powerline-plain/powerline-plain.base.bash" USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "} USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32} diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash index 49b397aa..78855b8d 100644 --- a/themes/powerline/powerline.theme.bash +++ b/themes/powerline/powerline.theme.bash @@ -2,7 +2,7 @@ # shellcheck disable=SC2034 # Expected behavior for themes. # shellcheck source=../../themes/powerline/powerline.base.bash -. "$BASH_IT/themes/powerline/powerline.base.bash" +. "${BASH_IT}/themes/powerline/powerline.base.bash" PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""} POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} diff --git a/themes/redline/redline.theme.bash b/themes/redline/redline.theme.bash index e8810106..bcfa9fcb 100644 --- a/themes/redline/redline.theme.bash +++ b/themes/redline/redline.theme.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -. "$BASH_IT/themes/powerline/powerline.base.bash" +. "${BASH_IT}/themes/powerline/powerline.base.bash" PROMPT_DISTRO_LOGO=" " PROMPT_DISTRO_LOGO_COLOR=15 diff --git a/uninstall.sh b/uninstall.sh index 6af2dc83..996fae5c 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,37 +1,37 @@ #!/usr/bin/env bash -if [ -z "$BASH_IT" ]; +if [ -z "${BASH_IT}" ]; then - BASH_IT="$HOME/.bash_it" + BASH_IT="${HOME}/.bash_it" fi case $OSTYPE in darwin*) - CONFIG_FILE=.bash_profile + CONFIG_FILE=".bash_profile" ;; *) - CONFIG_FILE=.bashrc + CONFIG_FILE=".bashrc" ;; esac -BACKUP_FILE=$CONFIG_FILE.bak +BACKUP_FILE="${CONFIG_FILE}.bak" -if [ ! -e "$HOME/$BACKUP_FILE" ] +if [ ! -e "${HOME}/${BACKUP_FILE}" ] then - echo -e "\033[0;33mBackup file $HOME/$BACKUP_FILE not found.\033[0m" >&2 + echo -e "\033[0;33mBackup file ${HOME}/$BACKUP_FILE not found.\033[0m" >&2 - test -w "$HOME/$CONFIG_FILE" && - mv "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.uninstall" && - echo -e "\033[0;32mMoved your $HOME/$CONFIG_FILE to $HOME/$CONFIG_FILE.uninstall.\033[0m" + test -w "${HOME}/${CONFIG_FILE}" && + mv "${HOME}/${CONFIG_FILE}" "${HOME}/${CONFIG_FILE}.uninstall" && + echo -e "\033[0;32mMoved your ${HOME}/$CONFIG_FILE to ${HOME}/${CONFIG_FILE}.uninstall.\033[0m" else - test -w "$HOME/$BACKUP_FILE" && - cp -a "$HOME/$BACKUP_FILE" "$HOME/$CONFIG_FILE" && - rm "$HOME/$BACKUP_FILE" && - echo -e "\033[0;32mYour original $CONFIG_FILE has been restored.\033[0m" + test -w "${HOME}/${BACKUP_FILE}" && + cp -a "${HOME}/${BACKUP_FILE}" "${HOME}/${CONFIG_FILE}" && + rm "${HOME}/${BACKUP_FILE}" && + echo -e "\033[0;32mYour original ${CONFIG_FILE} has been restored.\033[0m" fi echo "" echo -e "\033[0;32mUninstallation finished successfully! Sorry to see you go!\033[0m" echo "" echo "Final steps to complete the uninstallation:" -echo " -> Remove the $BASH_IT folder" +echo " -> Remove the ${BASH_IT } folder" echo " -> Open a new shell/tab/terminal" diff --git a/vendor/github.com/dsifford/yarn-completion/yarn b/vendor/github.com/dsifford/yarn-completion/yarn index fd0a1b02..09f57a53 100644 --- a/vendor/github.com/dsifford/yarn-completion/yarn +++ b/vendor/github.com/dsifford/yarn-completion/yarn @@ -49,15 +49,15 @@ function __yarn_get_package_fields() while getopts ":gt:" opt; do case $opt in g) - if [[ -f $HOME/.config/yarn/global/package.json ]] + if [[ -f ${HOME}/.config/yarn/global/package.json ]] then - package_dot_json="$HOME/.config/yarn/global/package.json" - elif [[ -f $HOME/.local/share/yarn/global/package.json ]] + package_dot_json="${HOME}/.config/yarn/global/package.json" + elif [[ -f ${HOME}/.local/share/yarn/global/package.json ]] then - package_dot_json="$HOME/.local/share/yarn/global/package.json" - elif [[ -f $HOME/.yarn/global/package.json ]] + package_dot_json="${HOME}/.local/share/yarn/global/package.json" + elif [[ -f ${HOME}/.yarn/global/package.json ]] then - package_dot_json="$HOME/.yarn/global/package.json" + package_dot_json="${HOME}/.yarn/global/package.json" else package_dot_json="" fi diff --git a/vendor/github.com/erichs/composure/c_extras.sh b/vendor/github.com/erichs/composure/c_extras.sh index 42c20d48..6b4611c7 100644 --- a/vendor/github.com/erichs/composure/c_extras.sh +++ b/vendor/github.com/erichs/composure/c_extras.sh @@ -177,7 +177,7 @@ function unique_metafor () example '$ unique_metafor group' group 'composure' - typeset keyword=$1 + typeset keyword="${1}" typeset file=$(mktemp /tmp/composure.XXXX) typeset -f | metafor $keyword >> $file @@ -201,7 +201,7 @@ function compost () example '$ compost myfunc' group 'composure' - typeset func=$1 + typeset func="${1}" [ -z "$func" ] && echo "you must specify a function name!" && return 1 ( diff --git a/vendor/github.com/erichs/composure/composure.sh b/vendor/github.com/erichs/composure/composure.sh index 40e4c1d4..fd7cf4d4 100755 --- a/vendor/github.com/erichs/composure/composure.sh +++ b/vendor/github.com/erichs/composure/composure.sh @@ -38,7 +38,7 @@ function _get_composure_dir() then echo "$XDG_DATA_HOME/composure" else - echo "$HOME/.local/composure" + echo "${HOME}/.local/composure" fi ############### Stack_TRACE_BUILDER ################ @@ -507,8 +507,8 @@ function draft() example '$ draft newfunc 1120 # wraps command at history line 1120 in newfunc()' group 'composure' - typeset func=$1 - typeset num=$2 + typeset func="${1}" + typeset num="${2}" if [ -z "$func" ] then @@ -610,7 +610,7 @@ function metafor() example '$ typeset -f glossary | metafor example' group 'composure' - typeset keyword=$1 + typeset keyword="${1}" if [ -z "$keyword" ] then @@ -643,7 +643,7 @@ function reference() example '$ reference revise' group 'composure' - typeset func=$1 + typeset func="${1}" if [ -z "$func" ] then printf '%s\n' 'missing parameter(s)' @@ -714,7 +714,7 @@ function revise() shift fi - typeset func=$1 + typeset func="${1}" if [ -z "$func" ] then printf '%s\n' 'missing parameter(s)'