Added reinstall script

4 files changed, 111 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03e8ab250ae4..47afbaa75af3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = blurry-text-fix
-	pkgdesc = Fixes blurry text in GTK4 and Flatpak
+	pkgdesc = Fixes blurry text in GTK4 / GTK3 and Flatpak
 	pkgver = 2
-	pkgrel = 3
+	pkgrel = 4
 	install = blurry-text-fix.install
 	arch = x86_64
 	license = GPL3
 	depends = gtk4
 	optdepends = flatpak
 	provides = blurry-text-fix
-	backup = usr/share/gtk-4.0/settings.ini
 
 pkgname = blurry-text-fix
diff --git a/PKGBUILD b/PKGBUILD
index 72667b36b79f..7d376d76aaa5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,17 @@
 # GitLab repo is temporarily unavailable
 pkgname=blurry-text-fix
 pkgver=2
-pkgrel=3
-pkgdesc="Fixes blurry text in GTK4 and Flatpak"
+pkgrel=4
+pkgdesc="Fixes blurry text in GTK4 / GTK3 and Flatpak"
 license=('GPL3')
 provides=('blurry-text-fix')
-install=$pkgname.install
+install=blurry-text-fix.install
 arch=('x86_64')
 depends=('gtk4')
 optdepends=('flatpak')
-backup=('usr/share/gtk-4.0/settings.ini')
 
 package() {
-	install -Dm755 ../settings.ini "$pkgdir/usr/share/gtk-4.0/settings-modified.ini"
+	install -Dm644 ../settings.ini "$pkgdir/etc/blurry-text-fix/gtk-3.0/settings.ini"
+    install -Dm644 ../settings.ini "$pkgdir/etc/blurry-text-fix/gtk-4.0/settings.ini"
+    install -Dm755 ../blurry-text-fix-reinstall "$pkgdir/usr/bin/blurry-text-fix-reinstall"
 }
diff --git a/blurry-text-fix-reinstall b/blurry-text-fix-reinstall
new file mode 100755
index 000000000000..ad80eced0354
--- /dev/null
+++ b/blurry-text-fix-reinstall
@@ -0,0 +1,43 @@
+if [ "$(id -u)" != 0 ]; then
+    echo "####################################"
+    echo "You need to run this command as root"
+    echo "####################################"
+    exit 1
+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."
+    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."
+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.."
+    flatpak override --filesystem=xdg-config/gtk-4.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."
+    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."
+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."
+exit 0
diff --git a/blurry-text-fix.install b/blurry-text-fix.install
index e7b8989cb9b7..11ed4eaa27a9 100644
--- a/blurry-text-fix.install
+++ b/blurry-text-fix.install
@@ -1,41 +1,71 @@
 pre_install() {
-	if [[ ! -f "/usr/share/gtk-4.0/settings.ini" ]]
-	then
-		echo "### ERROR: /usr/share/gtk-4.0/settings.ini doesn't exist."
-		exit 1
-	fi
+    if [[ ! -f "/usr/share/gtk-4.0/settings.ini" ]]
+    then
+        echo "### ERROR: /usr/share/gtk-4.0/settings.ini doesn't exist."
+        exit 1
+    fi
+
+    if [[ ! -f "/usr/share/gtk-3.0/settings.ini" ]]
+    then
+        echo "### ERROR: /usr/share/gtk-3.0/settings.ini doesn't exist."
+        exit 1
+    fi
 }
 
 post_install() {
-	if [[ ! -f "/usr/share/gtk-4.0/settings-old.ini" ]]
-	then
-		echo "Renaming settings.ini to 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 settings.ini."
-	mv /usr/share/gtk-4.0/settings-modified.ini /usr/share/gtk-4.0/settings.ini
-
-	if [[ -f "/usr/bin/flatpak" ]]
-	then
-		echo "Flatpak found! Overriding flatpak.."
-		flatpak override --filesystem=xdg-config/gtk-4.0
-	fi
-
-	echo "The new config file is stored in /usr/share/gtk-4.0/settings.ini."
-	echo "### Done. Please relog to apply changes."
+    # 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."
+        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."
+    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.."
+        flatpak override --filesystem=xdg-config/gtk-4.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."
+        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."
+    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."
+
 }
 
 post_upgrade() {
-	echo "### Please ignore file information warnings."
-	post_install
+    echo "### Please ignore the file information warnings."
+    post_install
 }
 
 post_remove() {
-	echo "Removing modified settings.ini."
-	rm /usr/share/gtk-4.0/settings.ini
-	echo "Restoring old settings.ini."
-	mv /usr/share/gtk-4.0/settings-old.ini /usr/share/gtk-4.0/settings.ini
-	echo "The old config file is stored in /usr/share/gtk-4.0/settings.ini."
-	echo "### Done. Please relog to apply changes."
+    echo "Removing modified gtk-4.0/settings.ini."
+    rm /usr/share/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."
+    rm /usr/share/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 "### Done. Please relog to apply changes."
 }