From 7d189e0c06af8470a1adcc2967c6cdca2dee7073 Mon Sep 17 00:00:00 2001
From: Rokosun <rokosun@noreply.git.trom.tf>
Date: Mon, 3 Jun 2024 10:18:08 +0000
Subject: [PATCH] Make sure that ~/.profile will be run at boot/login
Fixes issues with highDPI.
Added better comments and fixed a small bug.
---
bin/periodic/fix-theming | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/bin/periodic/fix-theming b/bin/periodic/fix-theming
index ced9230..af850cc 100755
--- a/bin/periodic/fix-theming
+++ b/bin/periodic/fix-theming
@@ -1,4 +1,9 @@
#!/bin/bash
+# shellcheck disable=SC2016
+
+# This script will sync your XFCE theme & font to work systemwide and in
+# a consistent manner accross different apps. It also improves
+# the highDPI scaling to give you a better experience.
# Exit out if the same script is already running in the background
pidof -sq -o %PPID -x "$(basename "$0")" && exit
@@ -16,6 +21,25 @@ mkdir -p "$flatpak_themes_dir" "$config_dir" ||
[ "$(xfconf-query -c xsettings -p /Xfce/SyncThemes)" != 'true' ] &&
xfconf-query -c xsettings -p /Xfce/SyncThemes -n -t bool -s true
+# Make sure ~/.profile is sourced inside ~/.bash_profile and ~/.zprofile
+source_profile() {
+ for file in "$HOME/.bash_profile" "$HOME/.zprofile"; do
+ # Continue looping if it is already sourced
+ grep -Exq '\s*(.*&& )?\. "?\$HOME"?/\.profile"?\s*' "$file" ||
+ grep -Exq "\s*(.*&& )?\. ~/\.profile\s*" "$file" && continue
+ # If not then source it
+ if grep -q '\S' "$file"; then
+ # shellcheck disable=SC2015
+ tail -n1 "$file" | grep -qx '\s*' &&
+ local -r begin='' || local -r begin='\n'
+ printf '%b[ -f "$HOME/.profile" ] && . "$HOME/.profile"\n' "$begin" >> "$file"
+ else
+ echo '[ -f "$HOME/.profile" ] && . "$HOME/.profile"' > "$file"
+ fi
+ done
+}
+source_profile
+
xdg_directory_lookup() {
# Go through each item in $XDG_DATA_DIRS and find the subdirectory $1
while read -r dir; do
@@ -43,7 +67,7 @@ profile_set_variable() {
# Set the variable to the correct value under a comment mentioning this script
if grep -xq '\s*#\s*Values set by the fix-theming script\s*' "$profile"; then
sed -i "/^\s*#\s*Values set by the fix-theming script\s*$/a export $1=$2" "$profile"
- elif grep -q '\s' "$profile"; then
+ elif grep -q '\S' "$profile"; then
# shellcheck disable=SC2015
tail -n1 "$profile" | grep -qx '\s*' &&
local -r begin='' || local -r begin='\n'
@@ -194,7 +218,8 @@ sync_font() {
sync_theme 'initial_sync'
sync_font
-# Monitor when the user changes their system theme/icons/font in XFCE and sync them as needed
+# Monitor when the user changes their system theme, font or
+# DPI setting in XFCE and sync them as needed
while read -r line; do
case "$line" in
'set: /Net/ThemeName') sync_theme ;;