From 57cd5cf29c7cb0088b8f9c43b94a55546e802eb2 Mon Sep 17 00:00:00 2001
From: eSh <mr.eshua@gmail.com>
Date: Sat, 17 Sep 2022 23:32:31 +0200
Subject: [PATCH 1/3] add post upgrade script to restart fixes

---
 PKGBUILD              | 3 ++-
 fixes-package.install | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 fixes-package.install

diff --git a/PKGBUILD b/PKGBUILD
index 08e9001..4a54c47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: TROM <contact@tromsite.com>
 pkgname=tromjaro-fixes
-pkgver=1.1.1
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Various fixes for TROMjaro OS"
 arch=(any)
@@ -12,6 +12,7 @@ depends=('xfce4-appfinder'
 provides=('tromjaro-fixes')
 backup=()
 options=(!strip)
+install=fixes-package.install
 
 prepare() {
     cp -R ../bin ../flatpak-overrides ../alpm-hooks . 
diff --git a/fixes-package.install b/fixes-package.install
new file mode 100644
index 0000000..ed862e1
--- /dev/null
+++ b/fixes-package.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+    kill $(ps aux | grep '[f]ix-flatpaks-theming\|[f]ix-theming\|[f]ix-tweaked-desktop-files' | awk '{print $2}')
+    fix-tweaked-desktop-files &
+    fix-theming &
+    fix-flatpaks-theming &
+}
\ No newline at end of file
-- 
2.39.5


From 7446f5ce650ca0012dd940ba1079807d4399312b Mon Sep 17 00:00:00 2001
From: eSh <mr.eshua@gmail.com>
Date: Sat, 17 Sep 2022 23:35:02 +0200
Subject: [PATCH 2/3] add multiple fix instances check

---
 bin/periodic/fix-flatpaks-theming | 1 +
 bin/periodic/fix-theming          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/periodic/fix-flatpaks-theming b/bin/periodic/fix-flatpaks-theming
index c4ab141..87f4e53 100755
--- a/bin/periodic/fix-flatpaks-theming
+++ b/bin/periodic/fix-flatpaks-theming
@@ -1,4 +1,5 @@
 #!/bin/sh
+pidof -sq -o %PPID -x "$(basename "$0")" && exit
 while :; do
     rm -r ~/.themes/* 2> /dev/null
     rsync -av --progress /usr/share/themes/* ~/.themes/ --exclude Windowck
diff --git a/bin/periodic/fix-theming b/bin/periodic/fix-theming
index 7ea4d30..053be92 100755
--- a/bin/periodic/fix-theming
+++ b/bin/periodic/fix-theming
@@ -20,6 +20,7 @@ sync_icon_theme() {
 	sed -i "s/^icon_theme=.*$/icon_theme=$icon_theme/" "$HOME"/.config/qt6ct/qt6ct.conf
 }
 
+pidof -sq -o %PPID -x "$(basename "$0")" && exit
 while :; do
 	# Get the current system theme
 	theme_new=$(xfconf-query -c xsettings -p /Net/ThemeName)
-- 
2.39.5


From ceb889b7b5e89750ae507a5d136eeb20395fdf1a Mon Sep 17 00:00:00 2001
From: eSh <mr.eshua@gmail.com>
Date: Sun, 18 Sep 2022 12:58:04 +0200
Subject: [PATCH 3/3] apply suggested changes

---
 fixes-package.install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fixes-package.install b/fixes-package.install
index ed862e1..78bd6d2 100644
--- a/fixes-package.install
+++ b/fixes-package.install
@@ -1,6 +1,6 @@
 post_upgrade() {
-    kill $(ps aux | grep '[f]ix-flatpaks-theming\|[f]ix-theming\|[f]ix-tweaked-desktop-files' | awk '{print $2}')
-    fix-tweaked-desktop-files &
-    fix-theming &
-    fix-flatpaks-theming &
+    killall -r 'fix-(flatpaks-theming|theming|tweaked-desktop-files)'
+    sudo -u "$SUDO_USER" setsid -f fix-tweaked-desktop-files
+    sudo -u "$SUDO_USER" setsid -f fix-theming
+    sudo -u "$SUDO_USER" setsid -f fix-flatpaks-theming
 }
\ No newline at end of file
-- 
2.39.5