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

fix(default-flatpaks): Last module definition overwrites the 1st one (#263)

Browse source
This commit is contained in:
fiftydinar 2024-06-19 16:29:54 +02:00 • committed by GitHub
parent b1c58137e4
commit e668d2ef02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/default-flatpaks/README.md
View file

@ -35,9 +35,3 @@ https://github.com/blue-build/modules/issues/146
Flatpak runtimes are not supported due to technical difficulty in implementing those:
https://github.com/blue-build/modules/pull/142#issuecomment-1962458757
Flatpak IDs input in the last module definition overwrites the 1st one.
This scenario happens when multiple module definitions of `default-flatpaks` are used.
This means that the only flatpak list that is going to take the effect is the one in last module definition.
More details about this issue:
https://github.com/blue-build/modules/issues/231

14
modules/default-flatpaks/default-flatpaks.sh
View file

@ -109,16 +109,22 @@ systemctl enable -f --global user-flatpak-setup.service
# Check that `system` is present before configuring. Also copy template list files before writing Flatpak IDs.
if [[ ! $(echo "$1" | yq -I=0 ".system") == "null" ]]; then
configure_flatpak_repo "$1" "system"
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/install /usr/share/bluebuild/default-flatpaks/system/install
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/remove /usr/share/bluebuild/default-flatpaks/system/remove
if [ ! -f "/usr/share/bluebuild/default-flatpaks/system/install" ]; then
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/install /usr/share/bluebuild/default-flatpaks/system/install
elif [ ! -f "/usr/share/bluebuild/default-flatpaks/system/remove" ]; then
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/remove /usr/share/bluebuild/default-flatpaks/system/remove
fi
configure_lists "$1" "system"
fi
# Check that `user` is present before configuring. Also copy template list files before writing Flatpak IDs.
if [[ ! $(echo "$1" | yq -I=0 ".user") == "null" ]]; then
configure_flatpak_repo "$1" "user"
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/user/install /usr/share/bluebuild/default-flatpaks/user/install
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/user/remove /usr/share/bluebuild/default-flatpaks/user/remove
if [ ! -f "/usr/share/bluebuild/default-flatpaks/user/install" ]; then
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/user/install /usr/share/bluebuild/default-flatpaks/user/install
elif [ ! -f "/usr/share/bluebuild/default-flatpaks/user/remove" ]; then
cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/user/remove /usr/share/bluebuild/default-flatpaks/user/remove
fi
configure_lists "$1" "user"
fi