From d9676d8c5afce3c35d282fb5053a9bbc7427526b Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 7 Jun 2019 20:31:02 -0400 Subject: [PATCH] Fix: use `babeltrace2` instead of `babeltrace` in plugin paths This was overlooked when renaming some parts of the project from `babeltrace` to `babeltrace2` recently. Basically it made the project not work when installed. Signed-off-by: Philippe Proulx Change-Id: Ie1079cee61d6cb6b9bc3787332e4635ee738542f Reviewed-on: https://review.lttng.org/c/babeltrace/+/1408 --- cli/babeltrace2-cfg-cli-args.c | 10 +++++----- common/common.c | 4 ++-- include/babeltrace2/common-internal.h | 4 ++-- lib/plugin/plugin.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/babeltrace2-cfg-cli-args.c b/cli/babeltrace2-cfg-cli-args.c index 09d11e31..a042d89a 100644 --- a/cli/babeltrace2-cfg-cli-args.c +++ b/cli/babeltrace2-cfg-cli-args.c @@ -1895,7 +1895,7 @@ void print_help_usage(FILE *fp) fprintf(fp, "Options:\n"); fprintf(fp, "\n"); fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\n"); - fprintf(fp, " (~/.local/lib/babeltrace/plugins)\n"); + fprintf(fp, " (~/.local/lib/babeltrace2/plugins)\n"); fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n"); fprintf(fp, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which\n"); fprintf(fp, " dynamic plugins can be loaded\n"); @@ -2056,7 +2056,7 @@ void print_query_usage(FILE *fp) fprintf(fp, "Options:\n"); fprintf(fp, "\n"); fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\n"); - fprintf(fp, " (~/.local/lib/babeltrace/plugins)\n"); + fprintf(fp, " (~/.local/lib/babeltrace2/plugins)\n"); fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n"); fprintf(fp, " -p, --params=PARAMS Set the query parameters to PARAMS\n"); fprintf(fp, " (see the expected format of PARAMS below)\n"); @@ -2249,7 +2249,7 @@ void print_list_plugins_usage(FILE *fp) fprintf(fp, "Options:\n"); fprintf(fp, "\n"); fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\n"); - fprintf(fp, " (~/.local/lib/babeltrace/plugins)\n"); + fprintf(fp, " (~/.local/lib/babeltrace2/plugins)\n"); fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n"); fprintf(fp, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which\n"); fprintf(fp, " dynamic plugins can be loaded\n"); @@ -2401,7 +2401,7 @@ void print_run_usage(FILE *fp) fprintf(fp, " to NAME (must be unique amongst all the\n"); fprintf(fp, " names of the created components)\n"); fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\n"); - fprintf(fp, " (~/.local/lib/babeltrace/plugins)\n"); + fprintf(fp, " (~/.local/lib/babeltrace2/plugins)\n"); fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n"); fprintf(fp, " -p, --params=PARAMS Add initialization parameters PARAMS to the\n"); fprintf(fp, " current component (see the expected format\n"); @@ -2829,7 +2829,7 @@ void print_convert_usage(FILE *fp) fprintf(fp, " to NAME (must be unique amongst all the\n"); fprintf(fp, " names of the created components)\n"); fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\n"); - fprintf(fp, " (~/.local/lib/babeltrace/plugins)\n"); + fprintf(fp, " (~/.local/lib/babeltrace2/plugins)\n"); fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n"); fprintf(fp, " -p, --params=PARAMS Add initialization parameters PARAMS to the\n"); fprintf(fp, " current component (see the expected format\n"); diff --git a/common/common.c b/common/common.c index 89f63d70..f2fd0b82 100644 --- a/common/common.c +++ b/common/common.c @@ -47,9 +47,9 @@ #include #endif -#define SYSTEM_PLUGIN_PATH INSTALL_LIBDIR "/babeltrace/plugins" +#define SYSTEM_PLUGIN_PATH INSTALL_LIBDIR "/babeltrace2/plugins" #define HOME_ENV_VAR "HOME" -#define HOME_PLUGIN_SUBPATH "/.local/lib/babeltrace/plugins" +#define HOME_PLUGIN_SUBPATH "/.local/lib/babeltrace2/plugins" static const char *bt_common_color_code_reset = ""; static const char *bt_common_color_code_bold = ""; diff --git a/include/babeltrace2/common-internal.h b/include/babeltrace2/common-internal.h index 7ca39469..d30da975 100644 --- a/include/babeltrace2/common-internal.h +++ b/include/babeltrace2/common-internal.h @@ -76,14 +76,14 @@ bool bt_common_is_setuid_setgid(void); /* * Returns the system-wide plugin path, e.g. - * `/usr/lib/babeltrace/plugins`. Do not free the return value. + * `/usr/lib/babeltrace2/plugins`. Do not free the return value. */ BT_HIDDEN const char *bt_common_get_system_plugin_path(void); /* * Returns the user plugin path, e.g. - * `/home/user/.local/lib/babeltrace/plugins`. You need to free the + * `/home/user/.local/lib/babeltrace2/plugins`. You need to free the * return value. */ BT_HIDDEN diff --git a/lib/plugin/plugin.c b/lib/plugin/plugin.c index f2f3b7ca..a6e9806d 100644 --- a/lib/plugin/plugin.c +++ b/lib/plugin/plugin.c @@ -195,10 +195,10 @@ const struct bt_plugin *bt_plugin_find(const char *plugin_name) * * 1. BABELTRACE_PLUGIN_PATH environment variable * (colon-separated list of directories) - * 2. ~/.local/lib/babeltrace/plugins + * 2. ~/.local/lib/babeltrace2/plugins * 3. Default system directory for Babeltrace plugins, usually - * /usr/lib/babeltrace/plugins or - * /usr/local/lib/babeltrace/plugins if installed + * /usr/lib/babeltrace2/plugins or + * /usr/local/lib/babeltrace2/plugins if installed * locally * 4. Built-in plugins (static) * -- 2.34.1