diff options
| -rwxr-xr-x | hardinfo2/configure | 2 | ||||
| -rw-r--r-- | hardinfo2/shell.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hardinfo2/configure b/hardinfo2/configure index 8b8d06f9..2bd91403 100755 --- a/hardinfo2/configure +++ b/hardinfo2/configure @@ -24,7 +24,7 @@ PACKAGE=`basename ${PWD} | cut -d"-" -f1`; VERSION=`basename ${PWD} | cut -d"-" -f2`; if [ "$PACKAGE" == "$VERSION" ]; then - VERSION=$(printf "SVN_%d" $(svn -R info|grep Revision|cut -d: -f2|sort -n |uniq|tail -n1)) + VERSION=$(printf "SVN_%d" $(svn -R info|grep Revision|cut -d: -f2|sort -n|tail -n1)) RELEASE=0 else RELEASE=1 diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 90e5722f..66d83cf9 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -299,11 +299,17 @@ create_window(void) static void shell_tree_modules_load(ShellTree * shelltree) { + gchar *modules_conf; GKeyFile *keyfile = g_key_file_new(); guint categories, i; keyfile = g_key_file_new(); - g_key_file_load_from_file(keyfile, PREFIX "modules.conf", 0, NULL); + + modules_conf = g_strdup_printf("%s/hardinfo/modules.conf", + gbr_find_data_dir(PREFIX)); + g_key_file_load_from_file(keyfile, modules_conf, 0, NULL); + g_free(modules_conf); + if (g_key_file_get_integer(keyfile, "general", "version", NULL) != 2) { g_error("Wrong version of modules.conf"); } |