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 <eeppeliteloop@gmail.com>
Change-Id: Ie1079cee61d6cb6b9bc3787332e4635ee738542f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1408

diff --git a/cli/babeltrace2-cfg-cli-args.c b/cli/babeltrace2-cfg-cli-args.c
index 09d11e3139a6f3f346e7760761ab4db99c9b3355..a042d89a3b22d34ec3830d1620efe0a938d4affe 100644 (file)
--- 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 89f63d70c387956580c1581ed25a71a4bcb522d9..f2fd0b82d62f8ca859a0dbd6c34e46ae8633ae48 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -47,9 +47,9 @@
 #include <pwd.h>
 #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 7ca3946958915d0230218071bbd151add69dbd11..d30da975a5a6a8d50bd90255c79d407818bfd6e3 100644 (file)
--- 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 f2f3b7ca1d461ec8421bf992b4ae765cd70a2705..a6e9806d21f77a26fcb8b61cd71e0c3cf7f3c808 100644 (file)
--- 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)
         *