commit 667e321

hovercats  ·  2025-05-22 01:29:44 +0000 UTC
parent 37ec070
change var name for ROOTFS_REPO
1 files changed,  +6, -6
M rcpm
M rcpm
+6, -6
 1@@ -6,7 +6,7 @@ flag e +
 2 RCPM_PATH=$PWD/repo
 3 RCPM_CACHE=$HOME/var/rcpm/bin
 4 RCPM_DB=/var/db/rcpm
 5-ROOTFS_REPO=/tmp/fs
 6+RCPM_ROOT=/tmp/fs
 7 
 8 if (~ $#RCPM_PATH 0) {
 9 	printf 'RCPM_PATH is not set\n'
10@@ -56,18 +56,18 @@ fn packup_pkg {
11 }
12 
13 fn create_worktree {
14-	if (test ! -d $ROOTFS_REPO/.git/worktrees/$pkg) {
15+	if (test ! -d $RCPM_ROOT/.git/worktrees/$pkg) {
16 		test -d $RCPM_DB || doas mkdir -p $RCPM_DB
17-		doas git -C $ROOTFS_REPO worktree add --orphan $RCPM_DB/$pkg
18+		doas git -C $RCPM_ROOT worktree add --orphan $RCPM_DB/$pkg
19 		doas git -C $RCPM_DB/$pkg symbolic-ref HEAD refs/heads/$pkg
20-		doas git -C $ROOTFS_REPO config --add branch.master.merge $pkg
21+		doas git -C $RCPM_ROOT config --add branch.master.merge $pkg
22 	}
23 	if not {printf 'Worktree exists\n'}
24 }
25 
26 fn merge_pkg {
27-	doas git -C $ROOTFS_REPO config --add branch.master.merge $pkg
28-	doas git -C $ROOTFS_REPO merge $pkg --allow-unrelated --no-edit
29+	doas git -C $RCPM_ROOT config --add branch.master.merge $pkg
30+	doas git -C $RCPM_ROOT merge $pkg --allow-unrelated --no-edit
31 }
32 
33 fn check_pkgbuilt {