reverts unsafe shell=True, add option for skipping reload environment

1 files changed, 8 insertions, 1 deletions

diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py
index 17c60a1..f1ce1dd 100644
--- a/pywal/wallpaper.py
+++ b/pywal/wallpaper.py
@@ -83,7 +83,14 @@ def set_desktop_wallpaper(desktop, img):
 
 def set_mac_wallpaper(img):
     """Set the wallpaper on macOS."""
-    subprocess.Popen(f"""osascript -e 'tell application "Finder" to set desktop picture to POSIX file "{img}"'""", shell=True)
+    db_file = HOME / "Library/Application Support/Dock/desktoppicture.db"
+    subprocess.call(["sqlite3", db_file, f"update data set value = '{img}'"])
+
+    # Kill the dock to fix issues with cached wallpapers.
+    # macOS caches wallpapers and if a wallpaper is set that shares
+    # the filename with a cached wallpaper, the cached wallpaper is
+    # used instead.
+    subprocess.call(["killall", "Dock"])
 
 
 def change(img):