From 1e5e8cd246b43c57d778af40e1a24963c2cb927d Mon Sep 17 00:00:00 2001
From: purian23 <purian23@gmail.com>
Date: Fri, 24 Oct 2025 18:26:26 -0400
Subject: [PATCH] Fix scope

---
 .github/workflows/copr-release.yml | 16 ++++++----------
 dms.spec                           | 16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/copr-release.yml b/.github/workflows/copr-release.yml
index 540a109a..1329e4a9 100644
--- a/.github/workflows/copr-release.yml
+++ b/.github/workflows/copr-release.yml
@@ -193,9 +193,8 @@ jobs:
 
           # Restart DMS for active users after upgrade
           if [ "$1" -ge 2 ]; then
-              dms_restarted=0
               # Find all quickshell DMS processes (PID and username)
-              pgrep -a -f 'quickshell.*dms' 2>/dev/null | while read pid cmd; do
+              while read pid cmd; do
                   username=$(ps -o user= -p "$pid" 2>/dev/null)
                   
                   [ "$username" = "root" ] && continue
@@ -212,21 +211,18 @@ jobs:
                   echo "Restarting DMS for user: $username"
                   
                   # Run as user with full Wayland session environment
-                  runuser -u "$username" -- /bin/sh -c "
+                  if runuser -u "$username" -- /bin/sh -c "
                       export XDG_RUNTIME_DIR=/run/user/$user_uid
                       export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$user_uid/bus
                       export WAYLAND_DISPLAY=$wayland_display
                       export PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:\$PATH
                       dms restart >/dev/null 2>&1
-                  " 2>/dev/null && dms_restarted=1 || true
+                  " 2>/dev/null; then
+                      echo -e "\033[1;34mDMS has been upgraded...\033[0m"
+                  fi
                   
                   break
-              done
-              
-              # Show success message if DMS was restarted
-              if [ $dms_restarted -eq 1 ]; then
-                  echo -e "\033[1;34mDMS has been upgraded...\033[0m"
-              fi
+              done < <(pgrep -a -f 'quickshell.*dms' 2>/dev/null)
           fi
 
           %files
diff --git a/dms.spec b/dms.spec
index e4b9a444..a1cd0bbb 100644
--- a/dms.spec
+++ b/dms.spec
@@ -150,9 +150,8 @@ fi
 
 # Restart DMS for active users after upgrade
 if [ "$1" -ge 2 ]; then
-    dms_restarted=0
     # Find all quickshell DMS processes (PID and username)
-    pgrep -a -f 'quickshell.*dms' 2>/dev/null | while read pid cmd; do
+    while read pid cmd; do
         username=$(ps -o user= -p "$pid" 2>/dev/null)
         
         [ "$username" = "root" ] && continue
@@ -169,21 +168,18 @@ if [ "$1" -ge 2 ]; then
         echo "Restarting DMS for user: $username"
         
         # Run as user with full Wayland session environment
-        runuser -u "$username" -- /bin/sh -c "
+        if runuser -u "$username" -- /bin/sh -c "
             export XDG_RUNTIME_DIR=/run/user/$user_uid
             export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$user_uid/bus
             export WAYLAND_DISPLAY=$wayland_display
             export PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:\$PATH
             dms restart >/dev/null 2>&1
-        " 2>/dev/null && dms_restarted=1 || true
+        " 2>/dev/null; then
+            echo -e "\033[1;34mDMS has been upgraded...\033[0m"
+        fi
         
         break
-    done
-    
-    # Show success message if DMS was restarted
-    if [ $dms_restarted -eq 1 ]; then
-        echo -e "\033[1;34mDMS has been upgraded...\033[0m"
-    fi
+    done < <(pgrep -a -f 'quickshell.*dms' 2>/dev/null)
 fi
 
 %files