commit 7dd6509
hovercats
·
2026-09-11 02:11:00 +0000 UTC
parent 93b6598
revert is_module and is_installed to a known working state. for no obvious reason the functions doesnt work.
1 files changed,
+4,
-8
M
rcpm
M
rcpm
+4,
-8
1@@ -23,12 +23,10 @@ if (~ $#rcpm_cache 0) {
2 }
3 }
4
5-fn is_module {grep -q pkg/$pkg/src ../../.gitmodules}
6-
7 fn dl_pkg {
8 cd $rcpm_path/$pkg
9 srcs=()
10- if (is_module) {
11+ if (grep -q pkg/$pkg/src ../../.gitmodules) {
12 git submodule update --init --checkout src
13 git -C src clean -xfdq
14 git -C src reset --hard
15@@ -109,8 +107,6 @@ fn gen_manifest {
16 sort -ru >./$rcpm_db/$pkg/manifest
17 }
18
19-fn is_installed {test -d $rcpm_root/$rcpm_db/$pkg}
20-
21 fn push_pkg {
22 cd $rcpm_root
23 $tool -dc $rcpm_cache/$pkg@$ver-$rev.tar.$ext | pax -r
24@@ -127,7 +123,7 @@ fn install_pkg {
25 mv -f ./$rcpm_db/$pkg/manifest ..
26 gen_manifest
27 if (cmp -s ../manifest ./$rcpm_db/$pkg/manifest) {
28- if (is_installed) {
29+ if (test -d $rcpm_root/$rcpm_db/$pkg) {
30 if (cmp -s $rcpm_root/$rcpm_db/$pkg/manifest ./$rcpm_db/$pkg/manifest) {
31 push_pkg
32 }
33@@ -151,7 +147,7 @@ fn install_pkg {
34 fn build_pkg {
35 chksum_pkg $pkg
36 if (test -f url) {
37- if (is_module) unpack_pkg $archive
38+ if (test -f .submodule) unpack_pkg $archive
39 if not {
40 rm -rf src/
41 unpack_pkg $archive
42@@ -183,7 +179,7 @@ fn get_local_ver {
43 }
44
45 fn rm_pkg {
46- if (! is_installed) {
47+ if (! test -d $rcpm_root/$rcpm_db/$pkg) {
48 errexit Error: Package not installed!
49 }
50 filelist=`{cat $rcpm_root/$rcpm_db/$pkg/manifest}