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

Merge remote-tracking branch 'upstream/main' into gschema-override-newline

Browse source
This commit is contained in:
fiftydinar 2024-02-25 14:13:46 +01:00
commit 3d5533b450
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/default-flatpaks/system-flatpak-setup
View file

@ -56,7 +56,7 @@ else
fi
# Installed flatpaks
FLATPAK_LIST=$(flatpak list --system --columns=application)
FLATPAK_LIST=$(flatpak list --system --app --columns=application)
# Flatpak list files
INSTALL_LIST_FILE="/usr/share/bluebuild/default-flatpaks/system/install"

2
modules/default-flatpaks/user-flatpak-setup
View file

@ -38,7 +38,7 @@ else
fi
# Installed flatpaks
FLATPAK_LIST=$(flatpak list --user --columns=application)
FLATPAK_LIST=$(flatpak list --user --app --columns=application)
# Flatpak list files
INSTALL_LIST_FILE="/usr/share/bluebuild/default-flatpaks/user/install"

8
modules/fonts/fonts.sh
View file

@ -1,6 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail
# Workaround for fonts module failing on legacy templates (with build.sh)
get_yaml_array() {
# creates array $1 with content at key $2 from $3
readarray "$1" < <(echo "$3" | yq -I=0 "$2")
}
export FONTS_MODULE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
for source in "$FONTS_MODULE_DIR"/sources/*.sh; do
@ -13,4 +19,4 @@ for source in "$FONTS_MODULE_DIR"/sources/*.sh; do
bash "$source" "${FONTS[@]}"
done
done