diff --git a/src/tmux_utils.sh b/src/tmux_utils.sh index 30ccb94..02dc33f 100644 --- a/src/tmux_utils.sh +++ b/src/tmux_utils.sh @@ -64,6 +64,13 @@ tmux_set_window_option_now() { # return the value of status style tmux_get_statusstyle() { - local _val=tmux show-option -gqv status-style + local _val + _val=$(tmux show-option -gqv status-style) + echo "$_val" +} + +tmux_get_statusleft() { + local _val + _val=$(tmux show-option -gqv status-left) echo "$_val" } diff --git a/tests/linux/test_check_gruvbox_dark256_enabled.sh b/tests/linux/test_check_gruvbox_dark256_enabled.sh index 4779e99..9e4d17c 100755 --- a/tests/linux/test_check_gruvbox_dark256_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark256_enabled.sh @@ -33,7 +33,7 @@ EOF # check if left side match _status_left_expected="#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh b/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh index d1656ed..274e778 100755 --- a/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh @@ -34,7 +34,7 @@ EOF # check if left side match _status_left_expected="#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_dark_enabled.sh b/tests/linux/test_check_gruvbox_dark_enabled.sh index ee111d7..17b9bb9 100755 --- a/tests/linux/test_check_gruvbox_dark_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark_enabled.sh @@ -33,7 +33,7 @@ EOF # check if left side match _status_left_expected="#[bg=#665c54,fg=#bdae93] #S #[bg=#3c3836,fg=#665c54,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh b/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh index 5c94b36..42a1213 100755 --- a/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh @@ -34,7 +34,7 @@ EOF # check if left side match _status_left_expected="#[bg=#665c54,fg=#bdae93] #S #[bg=#3c3836,fg=#665c54,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light256_enabled.sh b/tests/linux/test_check_gruvbox_light256_enabled.sh index 4b81f41..7c55396 100755 --- a/tests/linux/test_check_gruvbox_light256_enabled.sh +++ b/tests/linux/test_check_gruvbox_light256_enabled.sh @@ -33,7 +33,7 @@ EOF # check if left side match _status_left_expected="#[bg=colour239,fg=colour223] #S #[bg=colour250,fg=colour239,nobold,noitalics,nounderscore]" - _status_left_current=$() + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh b/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh index 2e5c7e0..ccf17a5 100755 --- a/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh @@ -34,7 +34,7 @@ EOF # check if left side match _status_left_expected="#[bg=colour239,fg=colour223] #S #[bg=colour250,fg=colour239,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light_enabled.sh b/tests/linux/test_check_gruvbox_light_enabled.sh index 13930af..db65da7 100755 --- a/tests/linux/test_check_gruvbox_light_enabled.sh +++ b/tests/linux/test_check_gruvbox_light_enabled.sh @@ -33,7 +33,7 @@ EOF # check if left side match _status_left_expected="#[bg=#bdae93,fg=#665c54] #S #[bg=#ebdbb2,fg=#bdae93,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light_transparent_enabled.sh b/tests/linux/test_check_gruvbox_light_transparent_enabled.sh index 0f1d914..c12fab1 100755 --- a/tests/linux/test_check_gruvbox_light_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_light_transparent_enabled.sh @@ -34,7 +34,7 @@ EOF # check if left side match _status_left_expected="#[bg=#bdae93,fg=#665c54] #S #[bg=#ebdbb2,fg=#bdae93,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown diff --git a/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh b/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh index abd7b9f..058ded6 100755 --- a/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh +++ b/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh @@ -36,7 +36,7 @@ EOF # check if left side match _status_left_expected="#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" - _status_left_current=$(tmux show-option -gqv status-left) + _status_left_current=$(tmux_get_statusleft) if [[ "$_status_left_current" != "$_status_left_expected" ]]; then helper_print_fail "status-left did not match" "$_status_left_current" "$_status_left_expected" helper_teardown