diff options
| author | Burt P <pburt0@gmail.com> | 2017-08-06 02:58:18 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2017-08-06 05:52:51 -0700 |
| commit | 6e7e698cf9fb82b7c289749d1345a231acf98df2 (patch) | |
| tree | 089fd651161187e8c5ba0fdab35b8f15fa576acc /modules | |
| parent | 51eeb3090dcb5de8f8dc3c10031359610fba703d (diff) | |
computer.c: tweaks
* Break "Not found" out of a c-format
* Tweak GDB regex. Old one would grab only closing paren
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/computer.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/modules/computer.c b/modules/computer.c index 60312719..d0379b79 100644 --- a/modules/computer.c +++ b/modules/computer.c @@ -220,7 +220,7 @@ void scan_dev(gboolean reload) { N_("Go"), "go version", "\\d+\\.\\d+\\.?\\d* ", TRUE }, { N_("Tools"), NULL, FALSE }, { N_("make"), "make --version", "\\d+\\.\\d+", TRUE }, - { N_("GDB"), "gdb --version", "\\d+\\.\\S+", TRUE }, + { N_("GDB"), "gdb --version", "(?<=^GNU gdb ).*", TRUE }, { N_("strace"), "strace -V", "\\d+\\.\\d+\\.?\\d*", TRUE }, { N_("valgrind"), "valgrind --version", "\\d+\\.\\d+\\.\\S+", TRUE }, { N_("QMake"), "qmake --version", "\\d+\\.\\S+", TRUE}, @@ -264,12 +264,11 @@ void scan_dev(gboolean reload) g_free(output); } - if (version) { - dev_list = h_strdup_cprintf("%s=%s\n", dev_list, detect_lang[i].compiler_name, version); - g_free(version); - } else { - dev_list = h_strdup_cprintf(_("%s=Not found\n"), dev_list, detect_lang[i].compiler_name); - } + if (version == NULL) + version = strdup(_("Not found")); + + dev_list = h_strdup_cprintf("%s=%s\n", dev_list, detect_lang[i].compiler_name, version); + g_free(version); temp = g_strdup_printf(_("Detecting version: %s"), detect_lang[i].compiler_name); |