gnome software order preferences (DEB, Flatpak)

src/trixie.sh

@@ -30,7 +30,7 @@ function trap_error() {
 function runVoid() {
   trap - ERR
   local COMMAND="$@"
-    bash -c "${COMMAND}" > /dev/null 2>&1
+  bash -c "${COMMAND}" >/dev/null 2>&1
   runVoidError=$?
   trap 'trap_error $? $LINENO' ERR
 }
@@ -94,7 +94,7 @@ function fix_system_lang {
 
     echo "fix found LANG=$LANG"
 
-        cat << EOF | sudo tee /etc/locale.gen
+    cat <<EOF | sudo tee /etc/locale.gen
 $LANG UTF-8	
 EOF
     sudo locale-gen
@@ -110,10 +110,10 @@ EOF
         echo $default_value removed!
       fi
     done
-        echo > $HOME/.config/gtk-3.0/bookmarks
+    echo >$HOME/.config/gtk-3.0/bookmarks
     for i in DOCUMENTS DOWNLOAD; do
       destination=$(xdg-user-dir $i)
-            echo file://$destination $(basename $destination) >> $HOME/.config/gtk-3.0/bookmarks
+      echo file://$destination $(basename $destination) >>$HOME/.config/gtk-3.0/bookmarks
     done
 
   else
@@ -138,7 +138,7 @@ function fix_input_sources {
 function miaou_bash {
   echo "## miaou-bash"
   echo "=============="
-    if ! command -v upgrade-miaou-bash > /dev/null; then
+  if ! command -v upgrade-miaou-bash >/dev/null; then
     curl https://git.artcode.re/miaou/miaou-bash/raw/branch/main/install.sh | sudo bash -s
   else
     echo "miaou-bash already installed!"
@@ -207,7 +207,7 @@ function install_firefox {
     sudo mkdir /opt/firefox -p
     sudo chown $USER /opt/firefox
     tar -xf "$firefox_archive" -C /opt
-        cat << EOF | sudo tee -a /usr/share/applications/firefox.desktop
+    cat <<EOF | sudo tee -a /usr/share/applications/firefox.desktop
 [Desktop Entry]
 Name=Firefox
 Comment=Web Browser
@@ -266,7 +266,7 @@ function tilix_default_terminal {
   echo "## prevent displaying desktop entries (gnome-terminal replaced by tilix)"
   echo "========================================================================"
   if [[ ! -f ~/.local/share/applications/org.gnome.Terminal.desktop ]]; then
-        cat << 'EOF' > ~/.local/share/applications/org.gnome.Terminal.desktop
+    cat <<'EOF' >~/.local/share/applications/org.gnome.Terminal.desktop
 [Desktop Entry]
 NoDisplay=true
 EOF
@@ -278,7 +278,7 @@ EOF
   echo "## prevent displaying desktop entries (xiterm+thai replaced by tilix)"
   echo "========================================================================"
   if [[ ! -f ~/.local/share/applications/xiterm+thai.desktop ]]; then
-        cat << 'EOF' > ~/.local/share/applications/xiterm+thai.desktop
+    cat <<'EOF' >~/.local/share/applications/xiterm+thai.desktop
 [Desktop Entry]
 NoDisplay=true
 EOF
@@ -288,7 +288,7 @@ EOF
   fi
 
   if [[ ! -f ~/.local/share/applications/com.gexperts.Tilix.desktop ]]; then
-        cat << 'EOF' > ~/.local/share/applications/com.gexperts.Tilix.desktop
+    cat <<'EOF' >~/.local/share/applications/com.gexperts.Tilix.desktop
 [Desktop Entry]
 Version=1.0
 Name=Tilix
@@ -428,14 +428,14 @@ function firefox_settings {
   echo "#========================="
 
   if [[ ! -f /opt/firefox/firefox.cfg ]]; then
-        cat << EOF | sudo tee -a /opt/firefox/firefox.cfg
+    cat <<EOF | sudo tee -a /opt/firefox/firefox.cfg
 // IMPORTANT: Start your code on the 2nd line
 
 lockPref("browser.pocket.enabled", false);
 lockPref("extensions.pocket.enabled", false);
 lockPref("browser.shell.checkDefaultBrowser", false);
 EOF
-        cat << EOF | sudo tee -a /opt/firefox/defaults/pref/autoconfig.js
+    cat <<EOF | sudo tee -a /opt/firefox/defaults/pref/autoconfig.js
 pref("general.config.filename", "firefox.cfg");
 pref("general.config.obscure_value", 0);
 EOF
@@ -480,6 +480,9 @@ function install_flatpak {
     XDG_DATA_DIRS=$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:$XDG_DATA_DIRS
     export XDG_DATA_DIRS
     flatpak update -y
+
+    # PREFER Debian packages over flatpak
+    gsettings set org.gnome.software packaging-format-preference "['DEB', 'flatpak']"
   fi
 
   flatpak install -y org.signal.Signal