better flatpak handling

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: TROM <contact@tromsite.com>
 pkgname=tromjaro-fixes
 pkgver=1.6
-pkgrel=0
+pkgrel=2
 pkgdesc="Various fixes for TROMjaro OS"
 arch=(any)
 url=""

bin/periodic/fix-flatpaks-theming

@@ -1,37 +1,44 @@
 #!/bin/bash
 
-# Set the directories
-shared_themes_dir=/usr/share/themes/
-local_themes_dir="$HOME/.themes/"
+# Exit out if the same script is already running in the background
+pidof -sq -o %PPID -x "$(basename "$0")" && exit
 
-# Function to synchronize themes from shared to local directory
-sync_themes() {
-    rsync -av --delete --progress "$shared_themes_dir" "$local_themes_dir"
-    echo "Directory $local_themes_dir is synchronized with $shared_themes_dir"
+# Set the directory paths
+
+target_themes_dir="$HOME/.themes"
+target_icons_dir="$HOME/.icons"
+
+# Create target directories if they don't exist
+mkdir -p "$target_themes_dir" "$target_icons_dir" ||
+	{ echo "failed to make directories $target_themes_dir & $target_icons_dir"; exit 1; }
+
+# Go through each item in $XDG_DATA_DIRS to find all other directories where
+# themes & icons are stored, and save these to source_themes_dirs & source_icons_dirs respectively
+while read -r dir; do
+	themes_subdir=${dir%/}/themes
+	icons_subdir=${dir%/}/icons
+	# Directories inside user's home directory will be created if nonexistant
+	for subdir in $themes_subdir $icons_subdir; do
+		[[ "$subdir" = "$HOME"/* ]] && mkdir -p "$subdir"
+	done
+	[ -d "$themes_subdir" ] && source_themes_dirs+=("$themes_subdir/")
+	[ -d "$icons_subdir" ] && source_icons_dirs+=("$icons_subdir/")
+done < <(printf '%s:%s\n' "$XDG_DATA_DIRS" "$HOME/.local/share" | tr ':' '\n' | sort -u)
+
+# Function to synchronize themes and icons from source to target directory
+sync_themes_and_icons() {
+    rsync -av --delete --progress "${source_themes_dirs[@]}" "$target_themes_dir"
+    rsync -av --delete --progress "${source_icons_dirs[@]}" "$target_icons_dir"
+    echo "Directories $target_themes_dir and $target_icons_dir are synchronized with source directories"
 }
 
 # Initial synchronization
-sync_themes
+sync_themes_and_icons
 
-# Function to monitor shared themes directory
-monitor_shared_themes() {
-    inotifywait -m -r -e 'modify,attrib,move,move_self,create,delete,delete_self,unmount' "$shared_themes_dir" > /dev/null 2>&1 &
-}
+echo "Set watch for theme directories:" "${source_themes_dirs[@]}" ", and icon directories:" "${source_icons_dirs[@]}"
 
-# Function to monitor local themes directory
-monitor_local_themes() {
-    inotifywait -m -r -e 'modify,attrib,move,move_self,create,delete,delete_self,unmount' "$local_themes_dir" > /dev/null 2>&1 &
-}
-
-# Start monitoring in the background
-monitor_shared_themes
-monitor_local_themes
-
-# Monitor changes and sync periodically
-while true; do
-    # Wait for a short period (e.g., 5 seconds) before syncing again
-    sleep 5
-
-    # Synchronize if there were changes in either directory
-    sync_themes
+# Start watching for file changes in the source theme and icon directories
+inotifywait -qmr -e 'modify,attrib,move,move_self,create,delete,delete_self,unmount' "${source_themes_dirs[@]}" "${source_icons_dirs[@]}" |
+while read -r _; do
+    sync_themes_and_icons
 done

bin/periodic/fix-theming

@@ -7,16 +7,8 @@ sync_theme() {
 	[ "$(xfconf-query -c xsettings -p /Xfce/SyncThemes)" != 'true' ] && xfconf-query -c xsettings -p /Xfce/SyncThemes -n -t bool -s true
 	# Apply the current theme with gsettings
 	gsettings set org.gnome.desktop.interface gtk-theme "$theme"
-	
-	# Apply the current theme for GTK apps in flatpak
-	
-	# Define the path to the flatpak override directory
-	flatpak_override_dir="$HOME/.local/share/flatpak/overrides"
-	# Create the directory if it doesn't exist
-	[ -d "$flatpak_override_dir" ] || mkdir -p "$flatpak_override_dir" || { echo 'failed creating directory!'; return 1; }
-	# Write the theme configuration to the global override file
-	echo "[Environment]
-GTK_THEME=$theme" > "$flatpak_override_dir/global"
+	# Apply the current theme for the all the GTK flatpaks
+    flatpak override --user --env=GTK_THEME="$theme"
 }
 
 sync_font() {