try to fix duplicate process handling

Author: glenrobertson

Casks/screenshot-renamer.rb

@@ -21,21 +21,13 @@ without touching unrelated files.
 
 ## Installation
 
-### Option 1: Homebrew
-
-```bash
-brew install --cask https://raw.githubusercontent.com/glenrobertson/macos-ai-screenshot-renamer/main/Casks/screenshot-renamer.rb
-```
-
-You'll be prompted to pick a folder for screenshots (defaults to `~/Screenshots`). Then click **"Add Shortcut"** when prompted, and grant any permissions in **System Settings > Privacy & Security**. Uninstall with `brew uninstall --cask screenshot-renamer`.
-
-### Option 2: Installer Package
+### Option 1: Installer Package
 
 Download `Screenshot-Renamer.pkg` from the [latest release](https://github.com/glenrobertson/macos-ai-screenshot-renamer/releases) and double-click to install.
 
 You'll be prompted to pick a folder for screenshots (defaults to `~/Screenshots`). Then click **"Add Shortcut"** when prompted, and grant any permissions in **System Settings > Privacy & Security**.
 
-### Option 3: Command Line
+### Option 2: Command Line
 
 ```bash
 git clone https://github.com/glenrobertson/macos-ai-screenshot-renamer.git
@@ -123,8 +115,6 @@ Logs are written to `~/Library/Logs/rename-screenshot.log`.
 
 ## Uninstall
 
-If you installed via Homebrew: `brew uninstall --cask screenshot-renamer`.
-
 If you installed via the `.pkg`, double-click `Uninstall-Screenshot-Renamer.pkg` from the [latest release](https://github.com/glenrobertson/macos-ai-screenshot-renamer/releases). Otherwise:
 
 ```bash

README.md

@@ -97,20 +97,42 @@ cat > "$WATCHER_SCRIPT" <<WATCHER
 
 SCREENSHOTS_DIR="$SCREENSHOTS_DIR"
 TIMESTAMP_FILE="\$HOME/Library/Scripts/.rename-screenshot-lastrun"
+LOCK_DIR="\$HOME/Library/Scripts/.rename-screenshot.lock"
 
 if [[ ! -f "\$TIMESTAMP_FILE" ]]; then
     touch -t 197001010000 "\$TIMESTAMP_FILE"
 fi
 
+# WatchPaths fires multiple fsevents per screenshot save. Without a lock the
+# parallel runs race the Shortcut's move and produce "item with the same
+# name already exists" errors. Stale locks >5min get reclaimed.
+if ! mkdir "\$LOCK_DIR" 2>/dev/null; then
+    if [[ -z \$(find "\$LOCK_DIR" -maxdepth 0 -mmin -5 2>/dev/null) ]]; then
+        rmdir "\$LOCK_DIR" 2>/dev/null
+        mkdir "\$LOCK_DIR" 2>/dev/null || exit 0
+    else
+        exit 0
+    fi
+fi
+trap 'rmdir "\$LOCK_DIR" 2>/dev/null' EXIT INT TERM
+
 sleep 2
 
-MARKER=\$(mktemp)
-while IFS= read -r file; do
-    [[ -f "\$file" ]] || continue
-    shortcuts run "Rename Screenshot" --input-path "\$file" >/dev/null
-done < <(find "\$SCREENSHOTS_DIR" -maxdepth 1 -name "Screenshot *.png" -newer "\$TIMESTAMP_FILE" ! -newer "\$MARKER")
-touch -r "\$MARKER" "\$TIMESTAMP_FILE"
-rm -f "\$MARKER"
+# Loop so screenshots arriving while the Shortcut is running are still
+# picked up. MARKER bounds each pass so files landing after find but before
+# the timestamp advance aren't skipped.
+while :; do
+    MARKER=\$(mktemp)
+    found=0
+    while IFS= read -r file; do
+        [[ -f "\$file" ]] || continue
+        found=1
+        shortcuts run "Rename Screenshot" --input-path "\$file" >/dev/null
+    done < <(find "\$SCREENSHOTS_DIR" -maxdepth 1 -name "Screenshot *.png" -newer "\$TIMESTAMP_FILE" ! -newer "\$MARKER")
+    touch -r "\$MARKER" "\$TIMESTAMP_FILE"
+    rm -f "\$MARKER"
+    (( found == 0 )) && break
+done
 WATCHER
 chmod +x "$WATCHER_SCRIPT"
 [ -n "$CHOWN" ] && chown "$CHOWN" "$WATCHER_SCRIPT"

Rename Screenshot.shortcut

@@ -88,6 +88,3 @@ fi
 
 echo
 echo "Done! Packages are in: $BUILD_DIR/"
-echo
-echo "SHA256 (paste into Casks/screenshot-renamer.rb):"
-shasum -a 256 "$BUILD_DIR/Screenshot-Renamer.pkg" | awk '{print $1}'

install.sh

@@ -8,8 +8,7 @@ STAGING="/usr/local/share/screenshot-renamer"
 
 "$STAGING/install.sh" "$STAGING/Rename Screenshot.shortcut"
 
-# Clean up install-only artifacts but leave uninstall.sh in place so the
-# Homebrew cask (and manual uninstall) can call it back later.
+# Clean up install-only artifacts but leave uninstall.sh for manual uninstall.
 rm -f "$STAGING/install.sh"
 rm -rf "$STAGING/Rename Screenshot.shortcut"