commit ab7f16a

hovercats  ·  2025-06-04 06:09:04 +0000 UTC
parent 92fedc8
make function names more consistent
1 files changed,  +12, -12
M rcpm
M rcpm
+12, -12
 1@@ -87,13 +87,13 @@ fn gen_manifest {
 2 		sort -ru >./$RCPM_DB/$pkg/manifest
 3 }
 4 
 5-fn pkg_install {
 6+fn install_pkg {
 7 	cd $RCPM_ROOT
 8 	get_ver
 9 	check_prebuilt || gzip -dc $RCPM_CACHE/$pkg@$ver-$rev.tar.gz | pax -r
10 }
11 
12-fn pkg_build {
13+fn build_pkg {
14 	cd $RCPM_PATH/$pkg
15 	if (test ! -f url) {
16 		git submodule update --init --checkout src
17@@ -112,7 +112,7 @@ fn pkg_build {
18 	../build
19 	cd $destdir
20 	packup_pkg
21-	pkg_install
22+	install_pkg
23 }
24 
25 
26@@ -122,26 +122,26 @@ fn get_local_ver {
27 	_rev=$_version(2)
28 }
29 
30-fn list_pkgs {
31+fn list_pkg {
32 	get_local_ver
33 	echo $pkg $_ver-$_rev
34 }
35 
36-fn rm_pkgs {
37+fn rm_pkg {
38 	filelist=`{cat $RCPM_ROOT/$RCPM_DB/$pkg/manifest}
39 	for (files in $filelist) {
40 		rmdir $RCPM_ROOT/$files >[2=] || rm -f $RCPM_ROOT/$files >[2=]
41 	}
42 }
43 
44-fn pkg_update {
45+fn update_pkg {
46 	for (file in $RCPM_ROOT/$RCPM_DB/*) {
47 		pkg=`{basename $file}
48 		if (cmp -s $RCPM_ROOT/$RCPM_DB/$pkg/ver $RCPM_PATH/$pkg/ver) {
49 			echo $pkg is up to date
50 		}
51 		if not {
52-			pkg_build $pkg
53+			build_pkg $pkg
54 		}
55 	}
56 }
57@@ -149,7 +149,7 @@ fn pkg_update {
58 switch($1) {
59 	case b
60 		shift
61-		for (pkg) pkg_build $pkg
62+		for (pkg) build_pkg $pkg
63 	case c
64 		shift
65 		for (pkg) chksum_pkg $pkg
66@@ -160,7 +160,7 @@ switch($1) {
67 		rcpm_help
68 	case i
69 		shift
70-		for (pkg) pkg_install $pkg
71+		for (pkg) install_pkg $pkg
72 	case l
73 		shift
74 		if (~ $#* 0) {
75@@ -170,17 +170,17 @@ switch($1) {
76 				echo $pkg $_ver-$_rev
77 			}
78 		}
79-		for (pkg) list_pkgs $pkg
80+		for (pkg) list_pkg $pkg
81 	case m
82 		cat $RCPM_ROOT/$RCPM_DB/$2/manifest
83 	case r
84 		shift
85-		for (pkg) rm_pkgs $pkg
86+		for (pkg) rm_pkg $pkg
87 	case s
88 		shift
89 		for (pkg in $*) find $RCPM_PATH -type d -name $pkg
90 	case u
91-		pkg_update
92+		update_pkg
93 	case *
94 		printf 'Error!\n'
95 		exit 1