fix(flatpak-manager): Don't install packages that are already present or remove packages that aren't there

This commit is contained in:
RJ Trujillo 2023-12-14 14:20:54 -07:00 committed by Kyle Gospodnetich
parent c900737371
commit 9deec489a0

View File

@ -21,22 +21,30 @@ fi
# Ensure Flathub is enabled # Ensure Flathub is enabled
flatpak remote-modify --system --enable flathub flatpak remote-modify --system --enable flathub
# Lists of flatpaks # Installed flatpaks
FLATPAK_LIST=$(flatpak list --columns=application) FLATPAK_LIST=$(flatpak list --columns=application)
INSTALL_LIST=$(cat /usr/share/ublue-os/bazzite/flatpak/install)
REMOVE_LIST=$(cat /usr/share/ublue-os/bazzite/flatpak/remove) # Flatpak list files
INSTALL_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/install"
REMOVE_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/remove"
# Install flatpaks in list # Install flatpaks in list
if [[ -n $INSTALL_LIST ]]; then if [[ -f $INSTALL_LIST_FILE ]]; then
if ! flatpak install --system --noninteractive flathub ${INSTALL_LIST[@]}; then INSTALL_LIST=$(echo $FLATPAK_LIST | grep -vf - $INSTALL_LIST_FILE)
# exit on error if [[ -n $INSTALL_LIST ]]; then
exit 1 if ! flatpak install --system --noninteractive flathub ${INSTALL_LIST[@]}; then
# exit on error
exit 1
fi
fi fi
fi fi
# Remove flatpaks in list # Remove flatpaks in list
if [[ -n $REMOVE_LIST ]]; then if [[ -f $REMOVE_LIST_FILE ]]; then
flatpak remove --system --noninteractive ${REMOVE_LIST[@]} REMOVE_LIST=$(echo $FLATPAK_LIST | grep -f - $REMOVE_LIST_FILE)
if [[ -n $REMOVE_LIST ]]; then
flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
fi
fi fi
mkdir -p /etc/bazzite mkdir -p /etc/bazzite