From 8e15ae90db008b013916088f2769f128cf5c8482 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 4 May 2025 21:14:32 +0200
Subject: [PATCH] home/modules/prism-launcher: look for screens in new instance
 data location

---
 .../programs/prism-launcher/default.nix       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/home/modules/programs/prism-launcher/default.nix b/home/modules/programs/prism-launcher/default.nix
index 209f4c9..3d2c23f 100644
--- a/home/modules/programs/prism-launcher/default.nix
+++ b/home/modules/programs/prism-launcher/default.nix
@@ -43,7 +43,10 @@ in
       Install.WantedBy = [ "paths.target" ];
       Unit.Description = "Watchdog that moves screenshots from all prismlauncher minecraft instances into a common dir";
       Path = {
-        PathExistsGlob = [ "${cfg.stateDir}/instances/*/.minecraft/screenshots/*.png" ];
+        PathExistsGlob = [
+          "${cfg.stateDir}/instances/*/.minecraft/screenshots/*.png"
+          "${cfg.stateDir}/instances/*/minecraft/screenshots/*.png"
+        ];
         Unit = "prismlauncher-move-minecraft-screenshots.service";
         TriggerLimitIntervalSec = "1s";
         TriggerLimitBurst = "1";
@@ -67,13 +70,17 @@ in
               INSTANCE_NAME="''${INSTANCE_NAME%'/'}"
               SCREENSHOT_TARGET_DIR="${cfg.screenshotMover.screenshotDir}/$INSTANCE_NAME"
               mkdir -p "''${SCREENSHOT_TARGET_DIR}"
-              if [ -d "${instancesDir}/$INSTANCE_NAME"/.minecraft/screenshots ]; then
-              for screenshot in "${instancesDir}/$INSTANCE_NAME"/.minecraft/screenshots/*.png; do
-                echo "Moving '$screenshot' -> '$SCREENSHOT_TARGET_DIR'"
-                cp --preserve=all "$screenshot" "$SCREENSHOT_TARGET_DIR"
-                rm "$screenshot"
+              for variant in minecraft .minecraft; do
+                SCREENSHOT_SOURCE_DIR="${instancesDir}/$INSTANCE_NAME/$variant"/screenshots
+                if [ -d "$SCREENSHOT_SOURCE_DIR" ]; then
+                  echo "Scanning for screenshots in $SCREENSHOT_SOURCE_DIR"
+                  for screenshot in "$SCREENSHOT_SOURCE_DIR"/*.png; do
+                    echo "Moving '$screenshot' -> '$SCREENSHOT_TARGET_DIR'"
+                    cp --preserve=all "$screenshot" "$SCREENSHOT_TARGET_DIR"
+                    rm "$screenshot"
+                  done
+                fi
               done
-              fi
             done
           '';
         });