From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Fri, 24 Jul 2026 09:03:21 +0000 (+0000)
Subject: [scripts] Derive main project from worktree path in merge-worktree.
X-Git-Url: https://git.ekhem.eu.org/?a=commitdiff_plain;h=41aad248128b2f6ef21627e0bb8dccf8885e9915;p=guix.git

[scripts] Derive main project from worktree path in merge-worktree.
---

diff --git a/.claude/scripts/merge-worktree b/.claude/scripts/merge-worktree
index 3561f1e..c88081b 100755
--- a/.claude/scripts/merge-worktree
+++ b/.claude/scripts/merge-worktree
@@ -6,7 +6,7 @@
 
 set -o errexit -o nounset
 
-PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$(pwd)}"
+PROJECT_DIR="$(echo "$PWD" | sed 's|/\.claude/worktrees/.*||')"
 
 # Absolute paths to Guix profile directories, avoiding $PATH lookup.
 GUIX_PROFILE="$HOME/.guix-profile"
diff --git a/.claude/settings.json b/.claude/settings.json
index f9249f5..6bd7704 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -1,5 +1,6 @@
 {
   "env": {
+    "CLAUDE_PROJECT_DIR": "$PWD",
     "GUIX_BIN": "/run/current-system/profile/bin",
     "PROFILE": "nonfree"
   },