lib/colors: rename theme/colors

devliq · Jan 28, 2022 · 2a8d8ba · 2a8d8ba
1 parent 7e79212
commit 2a8d8ba
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git a/bash_it.sh b/bash_it.sh
@@ -66,10 +66,6 @@ done
 # Load theme, if a theme was set
 if [[ -n "${BASH_IT_THEME}" ]]; then
 	_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: "
 	# shellcheck source=./themes/githelpers.theme.bash
 	source "${BASH_IT}/themes/githelpers.theme.bash"

diff --git a/themes/colors.theme.bash → lib/colors.bash b/themes/colors.theme.bash → lib/colors.bash
diff --git a/test/lib/log.bats b/test/lib/log.bats
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
 load ../test_helper
-load ../../themes/colors.theme
+load ../../lib/colors
 
 load ../../lib/log
 load ../../lib/helpers

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
@@ -19,7 +19,7 @@ load ../../plugins/available/base.plugin
   run myip
   assert_success
   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()' {

diff --git a/test/test_helper_libs.bash b/test/test_helper_libs.bash
@@ -5,3 +5,4 @@ load "${BASH_IT}/lib/utilities.bash"
 load "${BASH_IT}/lib/helpers.bash"
 load "${BASH_IT}/lib/search.bash"
 load "${BASH_IT}/lib/preexec.bash"
+load "${BASH_IT}/lib/colors.bash"
diff --git a/test/themes/base.theme.bats b/test/themes/base.theme.bats
@@ -2,7 +2,6 @@
 
 load ../test_helper
 load ../test_helper_libs
-load ../../themes/colors.theme
 load ../../themes/base.theme
 
 @test 'themes base: battery_percentage should not exist' {