serguzim/autostart-manage
1
0
Fork 0
Code Issues Pull requests Projects Releases1 Packages Wiki Activity Actions

Add extra check for empty group

Browse source
This commit is contained in:
Tobias Reisinger 2025-02-24 02:01:07 +01:00
parent a69141f542
commit 70558a4c77
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
2 changed files with 20 additions and 7 deletions

9
src/lib/colors.sh
View file

@ -26,17 +26,26 @@ yellow() { print_in_color "\e[33m" "$*"; }
blue() { print_in_color "\e[34m" "$*"; } blue() { print_in_color "\e[34m" "$*"; }
magenta() { print_in_color "\e[35m" "$*"; } magenta() { print_in_color "\e[35m" "$*"; }
cyan() { print_in_color "\e[36m" "$*"; } cyan() { print_in_color "\e[36m" "$*"; }
black() { print_in_color "\e[30m" "$*"; }
white() { print_in_color "\e[37m" "$*"; }
bold() { print_in_color "\e[1m" "$*"; } bold() { print_in_color "\e[1m" "$*"; }
underlined() { print_in_color "\e[4m" "$*"; } underlined() { print_in_color "\e[4m" "$*"; }
red_bold() { print_in_color "\e[1;31m" "$*"; } red_bold() { print_in_color "\e[1;31m" "$*"; }
green_bold() { print_in_color "\e[1;32m" "$*"; } green_bold() { print_in_color "\e[1;32m" "$*"; }
yellow_bold() { print_in_color "\e[1;33m" "$*"; } yellow_bold() { print_in_color "\e[1;33m" "$*"; }
blue_bold() { print_in_color "\e[1;34m" "$*"; } blue_bold() { print_in_color "\e[1;34m" "$*"; }
magenta_bold() { print_in_color "\e[1;35m" "$*"; } magenta_bold() { print_in_color "\e[1;35m" "$*"; }
cyan_bold() { print_in_color "\e[1;36m" "$*"; } cyan_bold() { print_in_color "\e[1;36m" "$*"; }
black_bold() { print_in_color "\e[1;30m" "$*"; }
white_bold() { print_in_color "\e[1;37m" "$*"; }
red_underlined() { print_in_color "\e[4;31m" "$*"; } red_underlined() { print_in_color "\e[4;31m" "$*"; }
green_underlined() { print_in_color "\e[4;32m" "$*"; } green_underlined() { print_in_color "\e[4;32m" "$*"; }
yellow_underlined() { print_in_color "\e[4;33m" "$*"; } yellow_underlined() { print_in_color "\e[4;33m" "$*"; }
blue_underlined() { print_in_color "\e[4;34m" "$*"; } blue_underlined() { print_in_color "\e[4;34m" "$*"; }
magenta_underlined() { print_in_color "\e[4;35m" "$*"; } magenta_underlined() { print_in_color "\e[4;35m" "$*"; }
cyan_underlined() { print_in_color "\e[4;36m" "$*"; } cyan_underlined() { print_in_color "\e[4;36m" "$*"; }
black_underlined() { print_in_color "\e[4;30m" "$*"; }
white_underlined() { print_in_color "\e[4;37m" "$*"; }

18
src/lib/common.sh
View file

@ -9,13 +9,17 @@ _query_autostart_toml() {
tomlq -r \ tomlq -r \
--arg host "$HOSTNAME" \ --arg host "$HOSTNAME" \
--argjson extra_groups "$groups_json" \ --argjson extra_groups "$groups_json" \
'.hosts[$host].groups as $groups | .apps | to_entries[] | select( '.hosts[$host].groups as $groups | .apps | to_entries[] | select(
(.value.hosts | contains([$host])) or (.value.hosts | contains([$host])) or
([.value.group] | inside($groups)) or (
([.value.group] | inside($extra_groups)) or (
$extra_groups == ["*"] ([.value.group] | inside($groups)) or
) | '"$1" \ ([.value.group] | inside($extra_groups)) or
"$XDG_CONFIG_HOME/autostart.toml" $extra_groups == ["*"]
) and (.value.group != "")
)
) | '"$1" \
"$XDG_CONFIG_HOME/autostart.toml"
} }
_list () { _list () {