particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Remove usage of yq in favor of jq (#369)

Browse source 
* chore: Remove usage of `yq` in favor of `jq`

* fix: Missed bracket in `default-flatpaks`

* fix: `get_json_array` complaining about unpopulated arrays

* fix(files): Forgot to input `-r` flag for some `jq` calls

* fix(gschema-overrides): Use `try` in `get_json_array`

* chore(default-flatpaks): Replace `yq` with `jq` in run-time setup binaries

* chore: Switch to simplified `jq` syntax without brackets

* chore(default-flatpaks): Switch `repo-info` file from `yml` to `json`

* fix(default-flatpaks): Some `yq` calls

* chore: Revert back to bracket syntax for more reliable `jq` parsing

* chore(files): Missed bracket syntax

* chore: Approve bot suggestion about quoting

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update modules/files/files.sh

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(yafti): Populating custom flatpaks

It's populated in reverse order compared to the format in recipe, but it works

* fix(fonts): Variable substitution is needed

* fix: Typo

* fix(fonts): Forgot to assign FONTS variable

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
fiftydinar 2024-12-02 20:02:13 +01:00 • committed by GitHub
parent ab654c9f16
commit 189048b119
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 90 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/systemd/systemd.sh
View file

@ -23,14 +23,14 @@ if [[ -d "$USER_UNIT_INCLUDE" ]]; then
fi
# Systemd units configuration (enable, disable, unmask & mask)
get_yaml_array ENABLED '.system.enabled[]' "$1"
get_yaml_array DISABLED '.system.disabled[]' "$1"
get_yaml_array UNMASKED '.system.unmasked[]' "$1"
get_yaml_array MASKED '.system.masked[]' "$1"
get_yaml_array USER_ENABLED '.user.enabled[]' "$1"
get_yaml_array USER_DISABLED '.user.disabled[]' "$1"
get_yaml_array USER_UNMASKED '.user.unmasked[]' "$1"
get_yaml_array USER_MASKED '.user.masked[]' "$1"
get_json_array ENABLED 'try .["system"].["enabled"][]' "$1"
get_json_array DISABLED 'try .["system"].["disabled"][]' "$1"
get_json_array UNMASKED 'try .["system"].["unmasked"][]' "$1"
get_json_array MASKED 'try .["system"].["masked"][]' "$1"
get_json_array USER_ENABLED 'try .["user"].["enabled"][]' "$1"
get_json_array USER_DISABLED 'try .["user"].["disabled"][]' "$1"
get_json_array USER_UNMASKED 'try .["user"].["unmasked"][]' "$1"
get_json_array USER_MASKED 'try .["user"].["masked"][]' "$1"
if [[ ${#ENABLED[@]} -gt 0 ]]; then
for unit in "${ENABLED[@]}"; do