Fix service target and ensure Gala is available for xrdb command to work

Author: rreina

plymouth/meson.build

@@ -9,4 +9,3 @@ install_data(
     'plymouth-hidpi.service',
     install_dir: '/etc/systemd/system'
 )
-

plymouth/plymouth-hidpi.service

@@ -1,13 +1,14 @@
 [Unit]
 Description=Configure Plymouth for HiDPI screens
-After=display-manager.service
-Requires=display-manager.service
+After=graphical.target
+Requires=graphical.target
 
 [Service]
 Type=oneshot
 Environment="DISPLAY=:0"
 ExecStart=/usr/local/bin/plymouth-hidpi.sh
-ExecStartPost=/bin/bash -c "systemctl disable plymouth-hidpi.service; rm -f /etc/systemd/system/plymouth-hidpi.service /usr/local/bin/plymouth-hidpi.sh"
+ExecStartPost=/bin/bash -c 'if [ $? -eq 0 ]; then systemctl disable plymouth-hidpi.service; rm -f /etc/systemd/system/plymouth-hidpi.service /usr/local/bin/plymouth-hidpi.sh; fi'
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=graphical.target
+

plymouth/plymouth-hidpi.sh

@@ -1,50 +1,45 @@
 #!/bin/bash
 
 CONFIG_FILE="/etc/plymouth/plymouthd.conf"
-DAEMON_SECTION="[Daemon]"
-SCALE_SETTING="DeviceScale=1"
 HIDPI_THRESHOLD=180 # Min DPI of a HiDPI screen
 
-# Get current DPI
-DPI=$(xrdb -query | grep dpi | awk '{print $2}')
+TIMEOUT=300  # Set the maximum wait time in seconds
+ELAPSED=0
 
-# Adds
-# [Daemon]
-# DeviceScale=1
-# only if missing in the file
-add_setting() {
-    # Remove first line if it's blank
-    sed -i '1{/^$/d}' "$CONFIG_FILE"
+# Wait until Gala is running or timeout occurs
+while ! pgrep -x "gala" > /dev/null && [ $ELAPSED -lt $TIMEOUT ]; do
+    sleep 1
+    ((ELAPSED++))
+done
 
-    if ! grep -q "$DAEMON_SECTION" "$CONFIG_FILE"; then
-        echo -e "$DAEMON_SECTION" >> "$CONFIG_FILE"
-    fi
+if [ $ELAPSED -ge $TIMEOUT ]; then
+    echo "Timeout reached while waiting for Gala to start" >&2
+    exit 1
+fi
 
-    sed -i "/$DAEMON_SECTION/a $SCALE_SETTING" "$CONFIG_FILE"
-}
+# Get current DPI
+export DISPLAY=":0"
+DPI=$(xrdb -query | grep dpi | awk '{print $2}')
 
-# Creates the configuration file with the necessary settings.
 create_config() {
-    echo -e "$DAEMON_SECTION\n$SCALE_SETTING" > "$CONFIG_FILE"
+    cat <<EOF > "$CONFIG_FILE"
+[Daemon]
+DeviceScale=1
+EOF
+    logger -t plymouth-hidpi "Created new config: '$CONFIG_FILE' with HiDPI setting"
 }
 
 apply_hidpi_setting() {
     if [[ "$DPI" -ge "$HIDPI_THRESHOLD" ]]; then
-        if [[ -f "$CONFIG_FILE" ]]; then
-            if ! grep -q "^DeviceScale" "$CONFIG_FILE"; then
-                add_setting
-                logger -t plymouth-hidpi "Added '$SCALE_SETTING' to '$CONFIG_FILE'"
-            else
-                logger -t plymouth-hidpi "HiDPI setting already present in '$CONFIG_FILE' no changes made"
-            fi
-        else
+        if [[ ! -f "$CONFIG_FILE" ]]; then
             create_config
-            logger -t plymouth-hidpi "Created new config: '$CONFIG_FILE' with HiDPI setting"
-        fi
 
-        # Apply the changes
-        update-initramfs -u
-        logger -t plymouth-hidpi "Updated initramfs after HiDPI change"
+            # Apply the changes
+            update-initramfs -u
+            logger -t plymouth-hidpi "Updated initramfs after HiDPI change"
+        else
+            logger -t plymouth-hidpi "HiDPI config file already exists, no changes made"
+        fi
     else
         logger -t plymouth-hidpi "Skipped HiDPI settings (DPI: $DPI, Threshold: $HIDPI_THRESHOLD)"
     fi