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

fix: Add check for empty flatpak list (#438)

Browse source 
fix: add check for empty flatpak list

Adds a check when `flatpak list` for the apps and runtimes is empty.

Fixes an issue where the flatpaks wouldn't install when no runtimes or apps where installed in user-space, due to an empty input being piped into `empty columns`

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
This commit is contained in:
Sjoerd Stendahl 2025-08-01 11:45:30 +02:00 • committed by GitHub
parent 85ca45644b
commit 580cdd534c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/default-flatpaks/v2/post-boot/system-flatpak-setup
View file

@ -23,15 +23,16 @@ def main [] {
flatpak remote-delete --system fedora-testing --force
}
let fedoraApps = flatpak list --system --app --columns=origin,application | detect columns --no-headers | where column0 == fedora | get column1
if (($fedoraApps | length) > 0) {
flatpak remove --system --noninteractive ...$fedoraApps
}
let fedoraRuntimes = flatpak list --system --runtime --columns=origin,application,arch,branch | detect columns --no-headers | where column0 == fedora | each {|i| $"($i.column1)/($i.column2)/($i.column3)" }
if (($fedoraRuntimes | length) > 0) {
let appList = (flatpak list --system --app --columns=origin,application)
if ($appList | is-not-empty) {
let fedoraApps = $appList | detect columns --no-headers | where column0 == fedora | get column1
flatpak remove --system --noninteractive ...$fedoraApps
}
let runtimeList = (flatpak list --system --runtime --columns=origin,application,arch,branch)
if ($runtimeList | is-not-empty) {
let fedoraRuntimes = $runtimeList | detect columns --no-headers | where column0 == fedora | each {|i| $"($i.column1)/($i.column2)/($i.column3)" }
flatpak remove --system --noninteractive ...$fedoraRuntimes
}
}
}
for config in ($configFile | where scope == system) {

18
modules/default-flatpaks/v2/post-boot/user-flatpak-setup
View file

@ -19,15 +19,17 @@ def main [] {
flatpak remote-delete --user fedora-testing --force
}
let fedoraApps = flatpak list --user --app --columns=origin,application | detect columns --no-headers | where column0 == fedora | get column1
if (($fedoraApps | length) > 0) {
flatpak remove --user --noninteractive ...$fedoraApps
}
let appList = (flatpak list --user --app --columns=origin,application)
if ($appList | is-not-empty) {
let fedoraApps = $appList | detect columns --no-headers | where column0 == fedora | get column1
flatpak remove --user --noninteractive ...$fedoraApps
}
let fedoraRuntimes = flatpak list --user --runtime --columns=origin,application,arch,branch | detect columns --no-headers | where column0 == fedora | each {|i| $"($i.column1)/($i.column2)/($i.column3)" }
if (($fedoraRuntimes | length) > 0) {
flatpak remove --user --noninteractive ...$fedoraRuntimes
}
let runtimeList = (flatpak list --user --runtime --columns=origin,application,arch,branch)
if ($runtimeList | is-not-empty) {
let fedoraRuntimes = $runtimeList | detect columns --no-headers | where column0 == fedora | each {|i| $"($i.column1)/($i.column2)/($i.column3)" }
flatpak remove --user --noninteractive ...$fedoraRuntimes
}
}
for config in ($configFile | where scope == user) {