Install flatpaks as the user

Author: hmlendea

scripts/common/package-management.sh

@@ -129,13 +129,15 @@ function is_flatpak_installed() {
 
     ! does_bin_exist 'flatpak' && return 1 # False
 
-    if (flatpak list | grep -q "${PACKAGE_NAME}" > /dev/null); then
-        if [ -z "${PACKAGE_BRANCH}" ]; then
-            return 0 # True
-        elif (flatpak list | grep "${PACKAGE_NAME}" | grep -q "${PACKAGE_BRANCH}" > /dev/null); then
-            return 0 # True
+    for INSTALLATION_METHOD in 'user' 'system'; do
+        if (flatpak list | grep -q "${PACKAGE_NAME}" > /dev/null); then
+            if [ -z "${PACKAGE_BRANCH}" ]; then
+                return 0 # True
+            elif (flatpak list | grep "${PACKAGE_NAME}" | grep -q "${PACKAGE_BRANCH}" > /dev/null); then
+                return 0 # True
+            fi
         fi
-    fi
+    done
 
     return 1 # False
 }
@@ -290,8 +292,10 @@ function install_flatpak() {
 
     is_flatpak_installed "${PACKAGE}" && return
 
-    echo -e " >>> Installing flatpak: \e[0;33m${PACKAGE}\e[0m (${REMOTE})..."
-    call_flatpak install --user "${REMOTE}" "${PACKAGE}"
+    local INSTALLATION_METHOD="user"
+
+    echo -e " >>> Installing ${INSTALLATION_METHOD} flatpak (${REMOTE}): \e[0;33m${PACKAGE}\e[0m (${REMOTE})..."
+    call_flatpak install --${INSTALLATION_METHOD} "${REMOTE}" "${PACKAGE}"
 }
 
 function install_vscode_package() {

scripts/configure-repositories.sh

@@ -35,34 +35,24 @@ function add_repository {
     fi
 }
 
-function add_system_flatpak_remote() {
-    local REMOTE_NAME="${1}"
-    local REMOTE_URL="${2}"
-
-    if ! flatpak remotes | grep -q "^${REMOTE_NAME}\s"; then
-        echo -e "Adding the \e[0;33m${REMOTE_NAME}\e[0m system flatpak remote..."
-        update_file_if_distinct "${REPO_DATA_DIR}/flatpak/keys/${REMOTE_NAME}" "${ROOT_VAR_LIB}/flatpak/repo/${REMOTE_NAME}.trustedkeys.gpg"
-        run_as_su flatpak remote-add --if-not-exists "${REMOTE_NAME}" "${REMOTE_URL}"
-    fi
-}
-
-function add_user_flatpak_remote() {
-    local REMOTE_NAME="${1}"
-    local REMOTE_URL="${2}"
-
-    if ! flatpak remotes | grep -q "^${REMOTE_NAME}\s"; then
-        echo -e "Adding the \e[0;33m${REMOTE_NAME}\e[0m user flatpak remote..."
-        update_file_if_distinct "${REPO_DATA_DIR}/flatpak/keys/${REMOTE_NAME}" "${XDG_DATA_HOME}/flatpak/repo/${REMOTE_NAME}.trustedkeys.gpg"
-        flatpak remote-add --user --if-not-exists "${REMOTE_NAME}" "${REMOTE_URL}"
+function add_flatpak_remote() {
+    local INSTALLATION_METHOD="${1}"
+    local REMOTE_NAME="${2}"
+    local REMOTE_URL="${3}"
+
+    if ! flatpak remotes --"${INSTALLATION_METHOD}" | grep -q "^${REMOTE_NAME}$"; then
+        echo -e "Adding the \e[0;33m${REMOTE_NAME}\e[0m ${INSTALLATION_METHOD} flatpak remote..."
+#        update_file_if_distinct "${REPO_DATA_DIR}/flatpak/keys/${REMOTE_NAME}" "${XDG_DATA_HOME}/flatpak/repo/${REMOTE_NAME}.trustedkeys.gpg"
+        flatpak remote-add --"${INSTALLATION_METHOD}" --if-not-exists "${REMOTE_NAME}" "${REMOTE_URL}"
     fi
 }
 
 if does_bin_exist 'flatpak'; then
-    add_system_flatpak_remote   'flathub'       'https://flathub.org/repo/flathub.flatpakrepo'
-    add_system_flatpak_remote   'flathub-beta'  'https://flathub.org/beta-repo/flathub-beta.flatpakrepo'
+    add_flatpak_remote 'system' 'flathub'       'https://flathub.org/repo/flathub.flatpakrepo'
+    add_flatpak_remote 'system' 'flathub-beta'  'https://flathub.org/beta-repo/flathub-beta.flatpakrepo'
 
-    add_user_flatpak_remote     'flathub'       'https://flathub.org/repo/flathub.flatpakrepo'
-    add_user_flatpak_remote     'flathub-beta'  'https://flathub.org/beta-repo/flathub-beta.flatpakrepo'
+    add_flatpak_remote 'user'   'flathub'       'https://flathub.org/repo/flathub.flatpakrepo'
+    add_flatpak_remote 'user'   'flathub-beta'  'https://flathub.org/beta-repo/flathub-beta.flatpakrepo'
 fi
 
 if [ "${DISTRO_FAMILY}" = 'Arch' ]; then

scripts/install-packages.sh

@@ -674,7 +674,7 @@ if [ "${DESKTOP_ENVIRONMENT}" = 'GNOME' ]; then
     install_flatpak 'org.gnome.seahorse.Application'
 fi
 
-install_flatpak 'org.bitwarden.desktop'
+install_flatpak 'com.bitwarden.desktop'
 
 ################
 ### Settings ###

scripts/uninstall-packages.sh

@@ -18,7 +18,12 @@ elif [[ "${DISTRO_FAMILY}" == "Debian" ]]; then
     yes | run_as_su apt autoremove
 fi
 
-does_bin_exist 'flatpak' && call_flatpak uninstall --unused
+if does_bin_exist 'flatpak'; then
+    for INSTALLATION_METHOD in 'user' 'system'; do
+        echo "Uninstalling unused ${INSTALLATION_METHOD} flatpak dependencies:"
+        call_flatpak uninstall --"${INSTALLATION_METHOD}" --unused
+    done
+fi
 
 function keep_first_installed_package() {
     local FIRST_INSTALLED_PACKAGE=''

scripts/update-package-repositories.sh

@@ -17,7 +17,7 @@ fi
 
 if does_bin_exist 'flatpak'; then
     echo -e 'Updating the \e[0;32msystem flatpak remotes\e[0m ...'
-    run_as_su flatpak update --appstream
+    run_as_su flatpak --system update --appstream
     echo -e 'Updating the \e[0;32muser flatpak remotes\e[0m ...'
     flatpak update --user --appstream
 fi