Add support for multiple r2pm package repos

radareorg · May 14, 2023 · f5273b1 · f5273b1
1 parent a1de6ab
commit f5273b1
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/libr/main/r2pm.c b/libr/main/r2pm.c
@@ -150,6 +150,7 @@ static char *r2pm_pkgdir(void) {
 
 typedef enum {
 	TT_TEXTLINE,
+	TT_TEXTLINE_LIST,
 	TT_CODEBLOCK,
 	TT_ENDQUOTE,
 } R2pmTokenType;
@@ -224,6 +225,14 @@ static char *r2pm_get(const char *file, const char *token, R2pmTokenType type) {
 			}
 			res = strdup (descptr);
 			break;
+		case TT_TEXTLINE_LIST:
+			descptr += strlen (needle);
+			nl = strchr (descptr, '\n');
+			if (nl) {
+				*nl = 0;
+			}
+			res = strdup (descptr);
+			break;
 		case TT_ENDQUOTE:
 			nl = strchr (descptr + strlen (token), '\n');
 			if (nl) {
@@ -600,17 +609,18 @@ static int r2pm_clone(const char *pkg) {
 	if (r_file_is_directory (srcdir)) {
 		git_pull (srcdir, 0);
 	} else {
-		char *url = r2pm_get (pkg, "\nR2PM_GIT ", TT_TEXTLINE);
-		if (url) {
-			char *dir = strchr (url, ' ');
-			if (dir) {
-				*dir++ = 0;
-				if (strcmp (dir, pkg)) {
-					R_LOG_WARN ("pkgname != clonedir");
+		char *url_list = r2pm_get (pkg, "\nR2PM_GIT ", TT_TEXTLINE_LIST);
+		if (url_list) {
+			r_str_replace_ch (url_list, ',', ' ', true);
+			int url_ct, i;
+			char **urls = r_str_argv (url_list, &url_ct);
+			for (i = 0; i < url_ct; i++) {
+				if (!git_clone (srcdir, urls[i])) {
+					break;
 				}
 			}
-			git_clone (srcdir, url);
-			free (url);
+			r_str_argv_free (urls);
+			free (url_list);
 		} else {
 			char *url = r2pm_get (pkg, "\nR2PM_TGZ", TT_TEXTLINE);
 			if (!url) {