1e1197dd0b
* chore(default-flatpaks): Switch to standardized BlueBuild location Use `/usr/etc/bluebuild/default-flatpaks` location instead of `/usr/etc/flatpaks` If possible, we should ideally use this location for system modifications: `/usr/share/bluebuild/default-flatpaks` While having user modifications in: `/usr/etc/bluebuild/default-flatpaks` But it needs to be figured out how the logic will work for separating system & user modifications this way. I used this logic in unofficial `initramfs-setup` module & it works well, by merging both system & user files into 1 output. However, this method can create duplicates if user specified it in it's modification, so I mentioned that user should look if the system entry has modifications they need. Perhaps, array diff can be done, which would circumvent this. So merge this for start. Only other module which has potential for migrating to standardized BlueBuild config is yafti (more details in other PR I'll do in some time). * refactor(default-flatpaks): Make default-flatpaks more robust Document in detail to user how he can change the config in files itself. Also document what files do in `/usr/share/bluebuild/default-flatpaks` as well. Refactor flatpak lists detection to be more reliable by excluding words starting with # symbols, whitelines & duplicate entries. Use `comm` for comparing flatpak list to existing flatpaks output instead of using `grep`, as it's easier to use & it's more reliable. Separate user's & maintainer's modifications better by utilizing read-only `/usr/share/bluebuild/default-flatpaks` directory for maintainers, while for users we would use `(/usr)/etc/bluebuild/default-flatpaks` directory. Reverting to defaults is more reliable as it would avoid users from touching maintainer's modification directly. I wouldn't modify repo-info.yml doc content, as we restrict it from user's modification & we wouldn't want to potentially ruin yaml parsing just for that. Only thing that remains is to test this in a VM. And look to potentially make code cleaner. * draft(default-flatpaks): Avoid install/remove duplicate loop scenario I have to figure out this part * draft(default-flatpaks): Avoid install/remove duplicate loop scenario pt.2 * draft(default-flatpaks): Avoid install/remove duplicate loop scenario pt.3 * fix(default-flatpaks): Avoid install/remove duplicate loop scenario * chore(default-flatpaks): minor grammar adjustment * draft(default-flatpaks): Account for scenario... when user sets the same package in install list that is in maintainer's remove list & vice-versa * fix(default-flatpaks): Account for scenario when user sets the same package in install list that is in maintainer's remove list & vice-versa * fix(default-flatpaks): Typo in code for combined install list * chore(default-flatpaks): Remove unnecessary echo * chore(default-flatpaks): Make directory for user config * chore(default-flatpaks): Explain user's vs maintainer's flatpak list situation better * fix(default-flatpaks): Typo in user's configuration for system flatpaks install * chore(default-flatpaks): There is no need to mkdir parent folder if child folder is created * chore(default-flatpaks): Make config organization cleaner Don't use echos for writing configs, use files instead for easier & more intuitive editing. * fix(default-flatpaks): Copy notification file properly Made a mistake in variable name * docs: README fixes - don't use ambiguous term "live-user" - capitalize Flatpak - grammar and phrasing changes * docs: grammar and phrasing changes in configuration file docs - replace "maintainer's config" with "image's default config" - rewrite flatpak list format explanation * docs: slightly reword local modification section again * chore(default-flatpaks): Add a missing newline to system flatpak list --------- Co-authored-by: xynydev
132 lines
6.6 KiB
Bash
Executable file
132 lines
6.6 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
|
|
# Opt out of and remove Fedora's flatpak repo
|
|
if grep -qz 'fedora' <<< "$(flatpak remotes)"; then
|
|
/usr/bin/gnome-software --quit
|
|
/usr/lib/fedora-third-party/fedora-third-party-opt-out
|
|
/usr/bin/fedora-third-party disable
|
|
flatpak remote-delete fedora --force
|
|
flatpak remote-delete fedora-testing --force
|
|
|
|
# Remove flatpak apps from origin fedora
|
|
FEDORA_FLATPAKS=$(flatpak list --app --columns=application,origin | grep -w 'fedora' | awk '{print $1}')
|
|
flatpak remove --system --noninteractive ${FEDORA_FLATPAKS[@]}
|
|
|
|
# Remove flatpak runtimes from origin fedora
|
|
FEDORA_FLATPAKS=$(flatpak list --runtime --columns=application,arch,branch,origin | grep -w 'fedora' | awk '{print $1"/"$2"/"$3}')
|
|
flatpak remove --system --noninteractive ${FEDORA_FLATPAKS[@]}
|
|
fi
|
|
|
|
REPO_INFO="/usr/share/bluebuild/default-flatpaks/system/repo-info.yml"
|
|
REPO_URL=$(yq '.repo-url' $REPO_INFO)
|
|
REPO_NAME=$(yq '.repo-name' $REPO_INFO)
|
|
REPO_TITLE=$(yq '.repo-title' $REPO_INFO)
|
|
|
|
# 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"
|
|
echo "Adding system-wide remote $REPO_NAME from $REPO_URL"
|
|
fi
|
|
|
|
# If configured remote is flathub, enable it here.
|
|
# Flathub is already installed on Fedora, but not enabled by default,
|
|
# so the above command won't add it again
|
|
if [[ $REPO_NAME == "flathub" ]]; then
|
|
flatpak remote-modify --system "$REPO_NAME" --enable
|
|
fi
|
|
|
|
# Change repository title to configured title, if not null
|
|
if [[ ! $REPO_TITLE == "null" ]]; then
|
|
flatpak remote-modify --system "$REPO_NAME" --title="$REPO_TITLE"
|
|
echo "Setting title $REPO_TITLE for remote $REPO_NAME"
|
|
fi
|
|
|
|
# Notifications config
|
|
NOTIFICATIONS_FILE="/usr/share/bluebuild/default-flatpaks/notifications"
|
|
USER_NOTIFICATIONS_FILE="/etc/bluebuild/default-flatpaks/notifications"
|
|
# Ignore words starting with # symbol, whitelines & duplicate entries for notifications config
|
|
MAINTAINER_NOTIFICATIONS=$(cat "$NOTIFICATIONS_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
|
|
USER_NOTIFICATIONS=$(cat "$USER_NOTIFICATIONS_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
|
|
|
|
# If user modified notifications config, utilize user's configuration, otherwise maintainer's
|
|
if [[ -n $USER_NOTIFICATIONS ]]; then
|
|
NOTIFICATIONS="$USER_NOTIFICATIONS"
|
|
else
|
|
NOTIFICATIONS="$MAINTAINER_NOTIFICATIONS"
|
|
fi
|
|
|
|
# Installed flatpaks
|
|
FLATPAK_LIST=$(flatpak list --system --columns=application)
|
|
|
|
# Flatpak list files
|
|
INSTALL_LIST_FILE="/usr/share/bluebuild/default-flatpaks/system/install"
|
|
REMOVE_LIST_FILE="/usr/share/bluebuild/default-flatpaks/system/remove"
|
|
USER_INSTALL_LIST_FILE="/etc/bluebuild/default-flatpaks/system/install"
|
|
USER_REMOVE_LIST_FILE="/etc/bluebuild/default-flatpaks/system/remove"
|
|
# Prefer user's install + remove list over maintainer's, in case when same flatpak ID is present in maintainer's install list + user's remove list & vice-versa
|
|
# Also ignores words starting with # symbol, whitelines & duplicate entries
|
|
MAINTAINER_INSTALL_LIST=$(comm -23 <(sort "$INSTALL_LIST_FILE") <(sort "$USER_REMOVE_LIST_FILE") | grep -v -E '^#|^$' | awk '!seen[$0]++')
|
|
MAINTAINER_REMOVE_LIST=$(comm -23 <(sort "$REMOVE_LIST_FILE") <(sort "$USER_INSTALL_LIST_FILE") | grep -v -E '^#|^$' | awk '!seen[$0]++')
|
|
# Combine maintainer & user list. Ignore words starting with # symbol, whitelines & duplicate entries
|
|
COMBINED_INSTALL_LIST=$(cat <(echo "$MAINTAINER_INSTALL_LIST") "$USER_INSTALL_LIST_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
|
|
COMBINED_REMOVE_LIST=$(cat <(echo "$MAINTAINER_REMOVE_LIST") "$USER_REMOVE_LIST_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
|
|
|
|
function notify-send-pre-install {
|
|
user_name=$(loginctl list-sessions --output=json | jq -r '.[].user')
|
|
uid=$(loginctl list-sessions --output=json | jq -r '.[].uid')
|
|
xdg_runtime_path="/run/user/$uid"
|
|
display_var=$(printenv DISPLAY)
|
|
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Started install of system flatpaks" --app-name="Flatpak Installer" -u NORMAL
|
|
}
|
|
|
|
function notify-send-install {
|
|
user_name=$(loginctl list-sessions --output=json | jq -r '.[].user')
|
|
uid=$(loginctl list-sessions --output=json | jq -r '.[].uid')
|
|
xdg_runtime_path="/run/user/$uid"
|
|
display_var=$(printenv DISPLAY)
|
|
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Finished install of system flatpaks:\n$INSTALL_LIST" --app-name="Flatpak Installer" -u NORMAL
|
|
}
|
|
|
|
function notify-send-pre-uninstall {
|
|
user_name=$(loginctl list-sessions --output=json | jq -r '.[].user')
|
|
uid=$(loginctl list-sessions --output=json | jq -r '.[].uid')
|
|
xdg_runtime_path="/run/user/$uid"
|
|
display_var=$(printenv DISPLAY)
|
|
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Started uninstall of some system flatpaks" --app-name="Flatpak Installer" -u NORMAL
|
|
}
|
|
|
|
function notify-send-uninstall {
|
|
user_name=$(loginctl list-sessions --output=json | jq -r '.[].user')
|
|
uid=$(loginctl list-sessions --output=json | jq -r '.[].uid')
|
|
xdg_runtime_path="/run/user/$uid"
|
|
display_var=$(printenv DISPLAY)
|
|
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Finished uninstall of system flatpaks:\n$REMOVE_LIST" --app-name="Flatpak Installer" -u NORMAL
|
|
}
|
|
|
|
# Install flatpaks in list
|
|
if [[ -f $INSTALL_LIST_FILE ]] || [[ -f $USER_INSTALL_LIST_FILE ]]; then
|
|
if [[ -n $FLATPAK_LIST ]]; then
|
|
INSTALL_LIST=$(comm -23 <(echo "$COMBINED_INSTALL_LIST" | sort) <(echo "$FLATPAK_LIST" | sort))
|
|
else
|
|
INSTALL_LIST="$COMBINED_INSTALL_LIST"
|
|
fi
|
|
if [[ -n $INSTALL_LIST ]] && [[ ! $NOTIFICATIONS == "true" ]]; then
|
|
flatpak install --system --noninteractive "$REPO_NAME" ${INSTALL_LIST[@]}
|
|
elif [[ -n $INSTALL_LIST ]] && [[ $NOTIFICATIONS == "true" ]]; then
|
|
notify-send-pre-install
|
|
flatpak install --system --noninteractive "$REPO_NAME" ${INSTALL_LIST[@]}
|
|
notify-send-install
|
|
fi
|
|
fi
|
|
|
|
# Remove flatpaks in list
|
|
if [[ -f $REMOVE_LIST_FILE ]] || [[ -f $USER_REMOVE_LIST_FILE ]]; then
|
|
REMOVE_LIST=$(comm -12 <(echo "$COMBINED_REMOVE_LIST" | sort) <(echo "$FLATPAK_LIST" | sort))
|
|
if [[ -n $REMOVE_LIST ]] && [[ ! $NOTIFICATIONS == "true" ]]; then
|
|
flatpak uninstall --system --noninteractive ${REMOVE_LIST[@]}
|
|
elif [[ -n $REMOVE_LIST ]] && [[ $NOTIFICATIONS == "true" ]]; then
|
|
notify-send-pre-uninstall
|
|
flatpak uninstall --system --noninteractive ${REMOVE_LIST[@]}
|
|
notify-send-uninstall
|
|
fi
|
|
fi
|