Updated install file

4 files changed, 19 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 251351daf9f6..9ebd415afeb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blurry-text-fix
 	pkgdesc = Fixes blurry text in GTK4 / GTK3 and Flatpak
 	pkgver = 2
-	pkgrel = 6
+	pkgrel = 7
 	install = blurry-text-fix.install
 	arch = any
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index bb929a1d5840..4d5006a6567b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # GitLab repo is temporarily unavailable
 pkgname=blurry-text-fix
 pkgver=2
-pkgrel=6
+pkgrel=7
 pkgdesc="Fixes blurry text in GTK4 / GTK3 and Flatpak"
 license=('GPL3')
 provides=('blurry-text-fix')
diff --git a/blurry-text-fix-reinstall b/blurry-text-fix-reinstall
index ad80eced0354..1cd1caac5532 100755..100644
--- a/blurry-text-fix-reinstall
+++ b/blurry-text-fix-reinstall
@@ -8,35 +8,30 @@ fi
 # GTK 4
 if [[ ! -f "/usr/share/gtk-4.0/settings-old.ini" ]]
 then
-    echo "Renaming gtk-4.0/settings.ini to gtk-4.0/settings-old.ini."
+    echo "> Renaming gtk-4.0/settings.ini to gtk-4.0/settings-old.ini."
     mv /usr/share/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings-old.ini
 fi
 
-echo "Installing modified config to gtk-4.0/settings.ini."
+echo "> Installing modified config to gtk-4.0/settings.ini."
 cp /etc/blurry-text-fix/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings.ini
 
 if [[ -f "/usr/bin/flatpak" ]]
 then
-    echo "Flatpak found! Overriding flatpak for GTK 4.0.."
+    echo "> Overriding Flatpak.."
     flatpak override --filesystem=xdg-config/gtk-4.0
+    flatpak override --filesystem=xdg-config/gtk-3.0
 fi
 
 # GTK 3
 if [[ ! -f "/usr/share/gtk-3.0/settings-old.ini" ]]
 then
-    echo "Renaming gtk-3.0/settings.ini to gtk-3.0/settings-old.ini."
+    echo "> Renaming gtk-3.0/settings.ini to gtk-3.0/settings-old.ini."
     mv /usr/share/gtk-3.0/settings.ini /usr/share/gtk-3.0/settings-old.ini
 fi
 
-echo "Installing modified config to gtk-3.0/settings.ini."
+echo "> Installing modified config to gtk-3.0/settings.ini."
 cp /etc/blurry-text-fix/gtk-3.0/settings.ini /usr/share/gtk-3.0/settings.ini
 
-if [[ -f "/usr/bin/flatpak" ]]
-then
-    echo "Flatpak found! Overriding flatpak for GTK 3.0.."
-    flatpak override --filesystem=xdg-config/gtk-3.0
-fi
-
 echo "INFO: Your backup file is in /usr/share/gtk-<version>/settings-old.ini"
 echo "INFO: If you want to edit settings.ini, then edit this file /etc/blurry-text-fix and then run blurry-text-fix-reload"
 echo "### Done. Please relog to apply changes."
diff --git a/blurry-text-fix.install b/blurry-text-fix.install
index 11ed4eaa27a9..66e1aad678ab 100644
--- a/blurry-text-fix.install
+++ b/blurry-text-fix.install
@@ -16,35 +16,30 @@ post_install() {
     # GTK 4
     if [[ ! -f "/usr/share/gtk-4.0/settings-old.ini" ]]
     then
-        echo "Renaming gtk-4.0/settings.ini to gtk-4.0/settings-old.ini."
+        echo "> Renaming gtk-4.0/settings.ini to gtk-4.0/settings-old.ini."
         mv /usr/share/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings-old.ini
     fi
 
-    echo "Installing modified config to gtk-4.0/settings.ini."
+    echo "> Installing modified config to gtk-4.0/settings.ini."
     cp /etc/blurry-text-fix/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings.ini
 
     if [[ -f "/usr/bin/flatpak" ]]
     then
-        echo "Flatpak found! Overriding flatpak for GTK 4.0.."
+        echo "> Overriding flatpak"
         flatpak override --filesystem=xdg-config/gtk-4.0
+        flatpak override --filesystem=xdg-config/gtk-3.0
     fi
     
     # GTK 3
     if [[ ! -f "/usr/share/gtk-3.0/settings-old.ini" ]]
     then
-        echo "Renaming gtk-3.0/settings.ini to gtk-3.0/settings-old.ini."
+        echo "> Renaming gtk-3.0/settings.ini to gtk-3.0/settings-old.ini."
         mv /usr/share/gtk-3.0/settings.ini /usr/share/gtk-3.0/settings-old.ini
     fi
 
-    echo "Installing modified config to gtk-3.0/settings.ini."
+    echo "> Installing modified config to gtk-3.0/settings.ini."
     cp /etc/blurry-text-fix/gtk-3.0/settings.ini /usr/share/gtk-3.0/settings.ini
 
-    if [[ -f "/usr/bin/flatpak" ]]
-    then
-        echo "Flatpak found! Overriding flatpak for GTK 3.0.."
-        flatpak override --filesystem=xdg-config/gtk-3.0
-    fi
-
     echo "INFO: Your backup file is in /usr/share/gtk-<version>/settings-old.ini"
     echo "INFO: If you want to edit settings.ini, then edit this file /etc/blurry-text-fix and then run blurry-text-fix-reload"
     echo "### Done. Please relog to apply changes."
@@ -57,15 +52,15 @@ post_upgrade() {
 }
 
 post_remove() {
-    echo "Removing modified gtk-4.0/settings.ini."
+    echo "> Removing modified gtk-4.0/settings.ini."
     rm /usr/share/gtk-4.0/settings.ini
-    echo "Restoring old gtk-4.0/settings.ini."
+    echo "> Restoring old gtk-4.0/settings.ini."
     mv /usr/share/gtk-4.0/settings-old.ini /usr/share/gtk-4.0/settings.ini
-    echo "Removing modified gtk-3.0/settings.ini."
+    echo "> Removing modified gtk-3.0/settings.ini."
     rm /usr/share/gtk-3.0/settings.ini
-    echo "Restoring old gtk-3.0/settings.ini."
+    echo "> Restoring old gtk-3.0/settings.ini."
     mv /usr/share/gtk-3.0/settings-old.ini /usr/share/gtk-3.0/settings.ini
 
-    echo "The old config file is stored in /usr/share/gtk-<version>/settings.ini."
+    echo "INFO: The old config file is stored in /usr/share/gtk-<version>/settings.ini."
     echo "### Done. Please relog to apply changes."
 }