fix: flatpak comparison in ujust script #172
Conversation
The previous comparison approach didn't work as newlines in the list were trimmed to form one string with all the flatpaks, and comm compares line by line. This uses bash arrays to properly manipulate the lists, additionally it sends a notification when new flatpaks are installed.
dosubot
bot
added
the
size:S
| CURR_LIST_FILE={{ CURR_LIST_FILE }} | ||
| IMAGE_NAME=$(jq -r '."image-name"' < "/usr/share/ublue-os/image-info.json") | ||
| FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ublue-os/aurora/main/aurora_flatpaks/flatpaks | tr '\n' ' ')" | ||
| flatpak --system -y install --or-update ${FLATPAK_LIST} |
There was a problem hiding this comment.
no clue how this got through lol
just/aurora-system.just
Outdated
| CURR_LIST_FILE={{ CURR_LIST_FILE }} | ||
| IMAGE_NAME=$(jq -r '."image-name"' < "/usr/share/ublue-os/image-info.json") | ||
| FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ublue-os/aurora/main/aurora_flatpaks/flatpaks | tr '\n' ' ')" | ||
| flatpak --system -y install --or-update ${FLATPAK_LIST} | ||
| FLATPAK_LIST=($(curl https://raw.githubusercontent.com/ublue-os/aurora/main/aurora_flatpaks/flatpaks)) |
There was a problem hiding this comment.
Would it be possible / would it make sense to put these files in the image instead of downloading them every time from the internet, in order to:
- avoid depending on internet connection to githubusercontent.com on every boot
- only consider the historical version of the recommended flatpak list that was active at the point in time when the image was built.
There was a problem hiding this comment.
Hmm, yeah we could curl the list in build time into /usr/share/ublue-os and compare against that in the recipe. I do like that approach much more, on it!
This way we don't need to curl against gh on boot, thx @etvt
dosubot
bot
added
size:M
derp... I also dont wanna add stuff to the main justfile
|
I'm going to force merge this PR because it fixes an issue with code that has already been merged, so it needs to be available in the |
| IMAGE_NAME=$(jq -r '."image-name"' < "/usr/share/ublue-os/image-info.json") | ||
| FLATPAK_LIST=($(curl https://raw.githubusercontent.com/ublue-os/aurora/main/aurora_flatpaks/flatpaks)) | ||
|
|
||
| if [[ ${IMAGE_NAME} =~ "dx" ]]; then | ||
| FLATPAK_LIST+=($(curl https://raw.githubusercontent.com/ublue-os/aurora/main/dx_flatpaks/flatpaks)) | ||
| fi |
There was a problem hiding this comment.
Is there any reason why this else branch is not
FLATPAK_LIST=($(cat /usr/share/ublue-os/flatpak_list))
?
There was a problem hiding this comment.
It keeps the old behavior of the recipe consistent. When the argument that points to a flatpak list is not given, it installs all the flatpaks from the repo (this only happens when the user manually does ujust install-system-flatpaks)
The previous comparison approach didn't work as newlines in the list were trimmed to form one string with all the flatpaks, and comm compares line by line.
This uses bash arrays to properly manipulate the lists, additionally it sends a notification when new flatpaks are installed.