commit b0938ce

hovercats  ·  2026-09-09 12:45:48 +0000 UTC
parent bbe8850
merge packup_pkg into build_pkg, as it were only called once
1 files changed,  +7, -11
M rcpm
M rcpm
+7, -11
 1@@ -93,16 +93,6 @@ fn rcpm_compressor {
 2 	}
 3 }
 4 
 5-fn packup_pkg {
 6-	mkdir -p ./$rcpm_db/$pkg
 7-	get_ver
 8-	printf $"version >./$rcpm_db/$pkg/ver
 9-	gen_manifest
10-	test -d $rcpm_cache || mkdir -p $rcpm_cache
11-	rcpm_compressor
12-	pax -w . | $tool > $rcpm_cache/$pkg@$ver-$rev.tar.$ext
13-}
14-
15 fn check_prebuilt {
16 	rcpm_compressor && status=()
17 	if (test ! -f $rcpm_cache/$pkg@$ver-$rev.tar.$ext) {
18@@ -136,7 +126,13 @@ fn build_pkg {
19 	destdir=/tmp/$pid/$pkg
20 	../build
21 	cd $destdir
22-	packup_pkg
23+	mkdir -p ./$rcpm_db/$pkg
24+	get_ver
25+	printf $"version >./$rcpm_db/$pkg/ver
26+	gen_manifest
27+	test -d $rcpm_cache || mkdir -p $rcpm_cache
28+	rcpm_compressor
29+	pax -w . | $tool > $rcpm_cache/$pkg@$ver-$rev.tar.$ext
30 	install_pkg
31 }
32