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

Revert "fix(default-flatpaks): Don't install packages that are already present or remove packages that aren't there"

Browse source 
This reverts commit 0e97138535.
This commit is contained in:
fiftydinar 2023-12-18 09:46:21 +01:00
parent c947f86b2f
commit 4e42e3d004
2 changed files with 18 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

26
files/usr/bin/system-flatpak-setup
View file

@ -52,30 +52,22 @@ if [[ ! $REPO_TITLE == "null" ]]; then
flatpak remote-modify --system $REPO_NAME --title="$REPO_TITLE"
fi
# Installed flatpaks
# Lists of flatpaks
FLATPAK_LIST=$(flatpak list --columns=application)
# Flatpak list files
INSTALL_LIST_FILE=$(cat /etc/flatpak/system/install)
REMOVE_LIST_FILE=$(cat /etc/flatpak/system/remove)
INSTALL_LIST=$(cat /etc/flatpak/system/install)
REMOVE_LIST=$(cat /etc/flatpak/system/remove)
# Install flatpaks in list
if [[ -f $INSTALL_LIST_FILE ]]; then
INSTALL_LIST=$(echo $FLATPAK_LIST | grep -vf - $INSTALL_LIST_FILE)
if [[ -n $INSTALL_LIST ]]; then
if ! flatpak install --system --noninteractive $REPO_NAME ${INSTALL_LIST[@]}; then
# Exit on error
exit 1
fi
if [[ -n $INSTALL_LIST ]]; then
if ! flatpak install --system --noninteractive $REPO_NAME ${INSTALL_LIST[@]}; then
# Exit on error
exit 1
fi
fi
# Remove flatpaks in list
if [[ -f $REMOVE_LIST_FILE ]]; then
REMOVE_LIST=$(echo $FLATPAK_LIST | grep -f - $REMOVE_LIST_FILE)
if [[ -n $REMOVE_LIST ]]; then
flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
fi
if [[ -n $REMOVE_LIST ]]; then
flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
fi
notify-send "Flatpak Installer" "Finished installing system flatpaks" --app-name="Flatpak Installer" -u NORMAL

26
files/usr/bin/user-flatpak-setup
View file

@ -34,30 +34,22 @@ if [[ ! $REPO_TITLE == "null" ]]; then
flatpak remote-modify --user $REPO_NAME --title="$REPO_TITLE"
fi
# Installed flatpaks
# Lists of flatpaks
FLATPAK_LIST=$(flatpak list --columns=application)
# Flatpak list files
INSTALL_LIST_FILE=$(cat /etc/flatpak/user/install)
REMOVE_LIST_FILE=$(cat /etc/flatpak/user/remove)
INSTALL_LIST=$(cat /etc/flatpak/user/install)
REMOVE_LIST=$(cat /etc/flatpak/user/remove)
# Install flatpaks in list
if [[ -f $INSTALL_LIST_FILE ]]; then
INSTALL_LIST=$(echo $FLATPAK_LIST | grep -vf - $INSTALL_LIST_FILE)
if [[ -n $INSTALL_LIST ]]; then
if ! flatpak install --user --noninteractive $REPO_NAME ${INSTALL_LIST[@]}; then
# Exit on error
exit 1
fi
if [[ -n $INSTALL_LIST ]]; then
if ! flatpak install --user --noninteractive $REPO_NAME ${INSTALL_LIST[@]}; then
# Exit on error
exit 1
fi
fi
# Remove flatpaks in list
if [[ -f $REMOVE_LIST_FILE ]]; then
REMOVE_LIST=$(echo $FLATPAK_LIST | grep -f - $REMOVE_LIST_FILE)
if [[ -n $REMOVE_LIST ]]; then
flatpak remove --user --noninteractive ${REMOVE_LIST[@]}
fi
if [[ -n $REMOVE_LIST ]]; then
flatpak remove --user --noninteractive $flatpak ${REMOVE_LIST[@]}
fi
notify-send "Flatpak Installer" "Finished installing user flatpaks" --app-name="Flatpak Installer" -u NORMAL