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

Fix install & uninstall for more than 1 flatpak in the list

Browse source
This commit is contained in:
fiftydinar 2023-12-20 08:53:07 +01:00
parent 40a45f6e5e
commit c550d67a29
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,11 +10,11 @@ if grep -qz 'fedora' <<< "$(flatpak remotes)"; then
# 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[@]}"
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[@]}"
flatpak remove --system --noninteractive ${FEDORA_FLATPAKS[@]}
fi
REPO_INFO="/etc/flatpak/system/repo-info.yml"
@ -56,7 +56,7 @@ if [[ -f $INSTALL_LIST_FILE ]]; then
INSTALL_LIST=$(cat $INSTALL_LIST_FILE)
fi
if [[ -n $INSTALL_LIST ]]; then
if ! flatpak install --system --noninteractive "$REPO_NAME" "${INSTALL_LIST[@]}"; then
if ! flatpak install --system --noninteractive "$REPO_NAME" ${INSTALL_LIST[@]}; then
# Exit on error
exit 1
fi
@ -67,7 +67,7 @@ fi
if [[ -f $REMOVE_LIST_FILE ]]; then
REMOVE_LIST=$(echo "$FLATPAK_LIST" | grep -o -f - "$REMOVE_LIST_FILE")
if [[ -n $REMOVE_LIST ]]; then
flatpak uninstall --system --noninteractive "${REMOVE_LIST[@]}"
flatpak uninstall --system --noninteractive ${REMOVE_LIST[@]}
fi
fi

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

@ -38,7 +38,7 @@ if [[ -f $INSTALL_LIST_FILE ]]; then
INSTALL_LIST=$(cat $INSTALL_LIST_FILE)
fi
if [[ -n $INSTALL_LIST ]]; then
if ! flatpak install --user --noninteractive "$REPO_NAME" "${INSTALL_LIST[@]}"; then
if ! flatpak install --user --noninteractive "$REPO_NAME" ${INSTALL_LIST[@]}; then
# Exit on error
exit 1
fi
@ -49,7 +49,7 @@ fi
if [[ -f $REMOVE_LIST_FILE ]]; then
REMOVE_LIST=$(echo "$FLATPAK_LIST" | grep -o -f - "$REMOVE_LIST_FILE")
if [[ -n $REMOVE_LIST ]]; then
flatpak uninstall --user --noninteractive "$flatpak" "${REMOVE_LIST[@]}"
flatpak uninstall --user --noninteractive "$flatpak" ${REMOVE_LIST[@]}
fi
fi