From 60bd37a15d827e782d3398c576d7c752c825d53c Mon Sep 17 00:00:00 2001
From: Victor Bayas <victorsbayas@gmail.com>
Date: Fri, 16 Aug 2024 21:20:38 -0500
Subject: [PATCH] Only try to remove files that exist during cleanup

---
 envycontrol.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/envycontrol.py b/envycontrol.py
index 1221d64..188ab2d 100755
--- a/envycontrol.py
+++ b/envycontrol.py
@@ -353,10 +353,11 @@ def cleanup():
         UDEV_PM_PATH,
         XORG_PATH,
         EXTRA_XORG_PATH,
-        '/etc/X11/xorg.conf.d/90-nvidia.conf',
         MODESET_PATH,
         LIGHTDM_SCRIPT_PATH,
         LIGHTDM_CONFIG_PATH,
+        # legacy files
+        '/etc/X11/xorg.conf.d/90-nvidia.conf',
         '/lib/udev/rules.d/50-remove-nvidia.rules',
         '/lib/udev/rules.d/80-nvidia-pm.rules'
     ]
@@ -364,8 +365,9 @@ def cleanup():
     # remove each file in the list
     for file_path in to_remove:
         try:
-            os.remove(file_path)
-            logging.info(f"Removed file {file_path}")
+            if os.path.exists(file_path):
+                os.remove(file_path)
+                logging.info(f"Removed file {file_path}")
         except OSError as e:
             # only warn if file exists (code 2)
             if e.errno != 2: