From df41e6968e12f75b514b605968fe3fb9a3c5740e Mon Sep 17 00:00:00 2001
From: bigbear <ns@bigbear.dk>
Date: Thu, 8 Feb 2024 00:02:48 +0100
Subject: ADD Package building for hardinfo2

---
 modules/benchmark.c            | 2 +-
 modules/devices/arm/arm_data.c | 2 +-
 modules/devices/monitors.c     | 4 ++--
 modules/devices/x86/x86_data.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/benchmark.c b/modules/benchmark.c
index c53790fa..312ef509 100644
--- a/modules/benchmark.c
+++ b/modules/benchmark.c
@@ -444,7 +444,7 @@ static gchar *find_benchmark_conf(void)
     const gchar *config_dir = g_get_user_config_dir();
     gchar *path;
 
-    path = g_build_filename(config_dir, "hardinfo", "benchmark.json", NULL);
+    path = g_build_filename(config_dir, "hardinfo2", "benchmark.json", NULL);
     if (g_file_test(path, G_FILE_TEST_EXISTS))
         return path;
     g_free(path);
diff --git a/modules/devices/arm/arm_data.c b/modules/devices/arm/arm_data.c
index 4ca77be9..aece272f 100644
--- a/modules/devices/arm/arm_data.c
+++ b/modules/devices/arm/arm_data.c
@@ -127,7 +127,7 @@ gchar *arm_ids_file = NULL;
 void find_arm_ids_file() {
     if (arm_ids_file) return;
     char *file_search_order[] = {
-        g_build_filename(g_get_user_config_dir(), "hardinfo", "arm.ids", NULL),
+        g_build_filename(g_get_user_config_dir(), "hardinfo2", "arm.ids", NULL),
         g_build_filename(params.path_data, "arm.ids", NULL),
         NULL
     };
diff --git a/modules/devices/monitors.c b/modules/devices/monitors.c
index 043c0d3b..38f3c9e6 100644
--- a/modules/devices/monitors.c
+++ b/modules/devices/monitors.c
@@ -36,7 +36,7 @@ gchar *ieee_oui_ids_file = NULL;
 void find_edid_ids_file() {
     if (edid_ids_file) return;
     char *file_search_order[] = {
-        g_build_filename(g_get_user_config_dir(), "hardinfo", "edid.ids", NULL),
+        g_build_filename(g_get_user_config_dir(), "hardinfo2", "edid.ids", NULL),
         g_build_filename(params.path_data, "edid.ids", NULL),
         NULL
     };
@@ -53,7 +53,7 @@ void find_edid_ids_file() {
 void find_ieee_oui_ids_file() {
     if (ieee_oui_ids_file) return;
     char *file_search_order[] = {
-        g_build_filename(g_get_user_config_dir(), "hardinfo", "ieee_oui.ids", NULL),
+        g_build_filename(g_get_user_config_dir(), "hardinfo2", "ieee_oui.ids", NULL),
         g_build_filename(params.path_data, "ieee_oui.ids", NULL),
         NULL
     };
diff --git a/modules/devices/x86/x86_data.c b/modules/devices/x86/x86_data.c
index 13108ebb..f56e8668 100644
--- a/modules/devices/x86/x86_data.c
+++ b/modules/devices/x86/x86_data.c
@@ -327,7 +327,7 @@ static void build_meaning_table_iter(JsonObject *object,
 
 void cpuflags_x86_init(void)
 {
-    gchar *flag_json = g_build_filename(g_get_user_config_dir(), "hardinfo",
+    gchar *flag_json = g_build_filename(g_get_user_config_dir(), "hardinfo2",
                                         "cpuflags.json", NULL);
     gboolean use_builtin_table = TRUE;
 
-- 
cgit v1.2.3