lib/colors: rename `theme/colors`

pull/2019/head^2
John D Pell 2022-01-26 12:32:10 -08:00
parent 7e79212dff
commit 2a8d8ba540
6 changed files with 3 additions and 7 deletions

View File

@ -66,10 +66,6 @@ done
# Load theme, if a theme was set # Load theme, if a theme was set
if [[ -n "${BASH_IT_THEME}" ]]; then if [[ -n "${BASH_IT_THEME}" ]]; then
_log_debug "Loading \"${BASH_IT_THEME}\" theme..." _log_debug "Loading \"${BASH_IT_THEME}\" theme..."
# Load colors and helpers first so they can be used in base theme
BASH_IT_LOG_PREFIX="themes: colors: "
# shellcheck source=./themes/colors.theme.bash
source "${BASH_IT}/themes/colors.theme.bash"
BASH_IT_LOG_PREFIX="themes: githelpers: " BASH_IT_LOG_PREFIX="themes: githelpers: "
# shellcheck source=./themes/githelpers.theme.bash # shellcheck source=./themes/githelpers.theme.bash
source "${BASH_IT}/themes/githelpers.theme.bash" source "${BASH_IT}/themes/githelpers.theme.bash"

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bats #!/usr/bin/env bats
load ../test_helper load ../test_helper
load ../../themes/colors.theme load ../../lib/colors
load ../../lib/log load ../../lib/log
load ../../lib/helpers load ../../lib/helpers

View File

@ -19,7 +19,7 @@ load ../../plugins/available/base.plugin
run myip run myip
assert_success assert_success
declare -r mask_ip=$(echo $output | tr -s '[0-9]' '?') declare -r mask_ip=$(echo $output | tr -s '[0-9]' '?')
[[ $mask_ip == 'Your public IP is: ?.?.?.?' ]] [[ $mask_ip == 'Your public IP is:'*'?.?.?.?'* ]]
} }
@test 'plugins base: pickfrom()' { @test 'plugins base: pickfrom()' {

View File

@ -5,3 +5,4 @@ load "${BASH_IT}/lib/utilities.bash"
load "${BASH_IT}/lib/helpers.bash" load "${BASH_IT}/lib/helpers.bash"
load "${BASH_IT}/lib/search.bash" load "${BASH_IT}/lib/search.bash"
load "${BASH_IT}/lib/preexec.bash" load "${BASH_IT}/lib/preexec.bash"
load "${BASH_IT}/lib/colors.bash"

View File

@ -2,7 +2,6 @@
load ../test_helper load ../test_helper
load ../test_helper_libs load ../test_helper_libs
load ../../themes/colors.theme
load ../../themes/base.theme load ../../themes/base.theme
@test 'themes base: battery_percentage should not exist' { @test 'themes base: battery_percentage should not exist' {