Use dir.plugins config var instead of hardcoded R2_LIBDIR in libs.c

radare · trufae · commit 72bec871258f · 2024-09-10T12:17:31.000+02:00
diff --git a/libr/core/libs.c b/libr/core/libs.c
@@ -158,9 +158,8 @@ static void load_scripts(RCore *core) {
 	load_scripts_at (core, homeplugindir);
 	free (homeplugindir);
 
-	char *sysplugindir = r_str_newf ("%s/radare2/%s", R2_LIBDIR, R2_VERSION);
+	const char *sysplugindir = r_config_get (core->config, "dir.plugins");
 	load_scripts_at (core, sysplugindir);
-	free (sysplugindir);
 }
 
 R_API bool r_core_loadlibs(RCore *core, int where, const char *path) {

Original file line number	Diff line number	Diff line change
`@@ -158,9 +158,8 @@ static void load_scripts(RCore *core) {`
`158`	`158`	`load_scripts_at (core, homeplugindir);`
`159`	`159`	`free (homeplugindir);`
`160`	`160`
`161`		`- char *sysplugindir = r_str_newf ("%s/radare2/%s", R2_LIBDIR, R2_VERSION);`
	`161`	`+ const char *sysplugindir = r_config_get (core->config, "dir.plugins");`
`162`	`162`	`load_scripts_at (core, sysplugindir);`
`163`		`- free (sysplugindir);`
`164`	`163`	`}`
`165`	`164`
`166`	`165`	`R_API bool r_core_loadlibs(RCore core, int where, const char path) {`