commit 441e8b5

hovercats  ·  2025-05-22 01:36:27 +0000 UTC
parent 667e321
remove git commands. theres probably better ways of achieving what we want here
1 files changed,  +1, -21
M rcpm
M rcpm
+1, -21
 1@@ -55,21 +55,6 @@ fn packup_pkg {
 2 	pax -w * | gzip > $RCPM_CACHE/$pkg@$ver-$rev.tar.gz
 3 }
 4 
 5-fn create_worktree {
 6-	if (test ! -d $RCPM_ROOT/.git/worktrees/$pkg) {
 7-		test -d $RCPM_DB || doas mkdir -p $RCPM_DB
 8-		doas git -C $RCPM_ROOT worktree add --orphan $RCPM_DB/$pkg
 9-		doas git -C $RCPM_DB/$pkg symbolic-ref HEAD refs/heads/$pkg
10-		doas git -C $RCPM_ROOT config --add branch.master.merge $pkg
11-	}
12-	if not {printf 'Worktree exists\n'}
13-}
14-
15-fn merge_pkg {
16-	doas git -C $RCPM_ROOT config --add branch.master.merge $pkg
17-	doas git -C $RCPM_ROOT merge $pkg --allow-unrelated --no-edit
18-}
19-
20 fn check_pkgbuilt {
21 	if (test ! -f $RCPM_DB/$pkg@$ver-$rev.tar.gz) {
22 		printf %s $pkg is not built\n
23@@ -82,13 +67,8 @@ fn gen_manifest {
24 }
25 
26 fn pkg_install {
27-	create_worktree
28-	cd $RCPM_DB/$pkg
29+	cd $RCPM_ROOT
30 	gzip -dc $RCPM_CACHE/$pkg@$ver-$rev.tar.gz | doas pax -r
31-	doas git add .
32-	echo $pkg@$ver-$rev | doas git commit '--file=-'
33-	merge_pkg
34-
35 }
36 
37 fn pkg_build {