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

chore(default-flatpaks): Don't modify the remote title if it's already modified

Browse source 
Wanting to avoid running unnecessary setup in logs as much as possible.

Unfortunately,
`flatpak remote-add` still runs even if repo exists, as it apparently modifies the URL, no matter if it's the same.

I tried to extract & compare input URL & flatpak URL to mitigate this as an condition, but it doesn't work, as flatpak lists repo URL, while we input flatpakref URLs, which are not the same.
This commit is contained in:
fiftydinar 2024-08-04 20:37:23 +02:00
parent 7dd82e1159
commit 37466a71cb
2 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,10 +22,28 @@ REPO_URL=$(yq '.repo-url' $REPO_INFO)
REPO_NAME=$(yq '.repo-name' $REPO_INFO)
REPO_TITLE=$(yq '.repo-title' $REPO_INFO)
# General conditions for not running the unnecessary flatpak setup
# Currently, we don't modify remote title if it's already modified
# Flatpak add remote is ran for some reason, even with --if-not-exists flag, apparently, it modifies the URL
# We cannot compare repo URLs properly
# Flatpak outputs repo URL, while we have flatpakref URL, which is not the same
readarray -t CURRENT_REPO_INFO < <(flatpak remotes --system --columns=name,url,title)
for index in "${CURRENT_REPO_INFO[@]}"; do
CURRENT_REPO_NAMES+=("$(echo "${index}" | awk '{print $1}')")
CURRENT_REPO_TITLES+=("$(echo "${index}" | awk '{ for(i=3;i<NF;i++) printf "%s ", $i; print $NF }')")
for name in "${CURRENT_REPO_NAMES[@]}"; do
for title in "${CURRENT_REPO_TITLES[@]}"; do
if [[ "${name}" == "${REPO_NAME}" ]] && [[ "${title}" == "${REPO_TITLE}" ]]; then
no_title_modify=true
fi
done
done
done
# Set up system-wide Flatpak repository
if [[ ! $REPO_URL == "null" && ! $REPO_NAME == "null" ]]; then
flatpak remote-add --if-not-exists --system "$REPO_NAME" "$REPO_URL"
if [[ $REPO_URL != "null" && $REPO_NAME != "null" ]]; then
echo "Adding system-wide remote $REPO_NAME from $REPO_URL"
flatpak remote-add --if-not-exists --system "$REPO_NAME" "$REPO_URL"
fi
# If configured remote is flathub, enable it here.
@ -36,7 +54,7 @@ if [[ $REPO_NAME == "flathub" ]]; then
fi
# Change repository title to configured title, if not null
if [[ ! $REPO_TITLE == "null" ]]; then
if [[ $REPO_TITLE != "null" ]] && ! ${no_title_modify}; then
flatpak remote-modify --system "$REPO_NAME" --title="$REPO_TITLE"
echo "Setting title $REPO_TITLE for remote $REPO_NAME"
fi

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

@ -11,14 +11,32 @@ REPO_URL=$(yq '.repo-url' $REPO_INFO)
REPO_NAME=$(yq '.repo-name' $REPO_INFO)
REPO_TITLE=$(yq '.repo-title' $REPO_INFO)
# General conditions for not running the unnecessary flatpak setup
# Currently, we don't modify remote title if it's already modified
# Flatpak add remote is ran for some reason, even with --if-not-exists flag, apparently, it modifies the URL
# We cannot compare repo URLs properly
# Flatpak outputs repo URL, while we have flatpakref URL, which is not the same
readarray -t CURRENT_REPO_INFO < <(flatpak remotes --user --columns=name,url,title)
for index in "${CURRENT_REPO_INFO[@]}"; do
CURRENT_REPO_NAMES+=("$(echo "${index}" | awk '{print $1}')")
CURRENT_REPO_TITLES+=("$(echo "${index}" | awk '{ for(i=3;i<NF;i++) printf "%s ", $i; print $NF }')")
for name in "${CURRENT_REPO_NAMES[@]}"; do
for title in "${CURRENT_REPO_TITLES[@]}"; do
if [[ "${name}" == "${REPO_NAME}" ]] && [[ "${title}" == "${REPO_TITLE}" ]]; then
no_title_modify=true
fi
done
done
done
# Set up per-user Flatpak repository
if [[ ! $REPO_URL == "null" && ! $REPO_NAME == "null" ]]; then
flatpak remote-add --if-not-exists --user "$REPO_NAME" "$REPO_URL"
if [[ $REPO_URL != "null" && $REPO_NAME != "null" ]]; then
echo "Adding remote $REPO_NAME from $REPO_URL"
flatpak remote-add --if-not-exists --user "$REPO_NAME" "$REPO_URL"
fi
# Change repository title to configured title, if not null
if [[ ! $REPO_TITLE == "null" ]]; then
if [[ $REPO_TITLE != "null" ]] && ! ${no_title_modify}; then
flatpak remote-modify --user "$REPO_NAME" --title="$REPO_TITLE"
echo "Setting title $REPO_TITLE for remote $REPO_NAME"
fi