From 8aea41e153ae1f3110109919a9a3eea0b1cab770 Mon Sep 17 00:00:00 2001 From: Leandro Pereira Date: Mon, 1 Jul 2019 19:19:54 -0700 Subject: Use "debian" for Debian distrocode When parsing the -- now preferred -- os-release file, the distro ID is "Debian", which is lowercased. --- modules/computer/os.c | 4 ++-- pixmaps/distros/deb.png | Bin 842 -> 0 bytes pixmaps/distros/debian.png | Bin 0 -> 842 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 pixmaps/distros/deb.png create mode 100644 pixmaps/distros/debian.png diff --git a/modules/computer/os.c b/modules/computer/os.c index d7710151..536d328f 100644 --- a/modules/computer/os.c +++ b/modules/computer/os.c @@ -422,7 +422,7 @@ detect_distro(void) #define DB_PREFIX "/etc/" { DB_PREFIX "arch-release", "arch", "Arch Linux" }, { DB_PREFIX "fatdog-version", "fatdog" }, - { DB_PREFIX "debian_version", "deb" }, + { DB_PREFIX "debian_version", "debian" }, { DB_PREFIX "slackware-version", "slk" }, { DB_PREFIX "mandrake-release", "mdk" }, { DB_PREFIX "mandriva-release", "mdv" }, @@ -475,7 +475,7 @@ detect_distro(void) .codename = g_strdup(distro_db[i].codename) }; } - if (g_str_equal(distro_db[i].codename, "deb")) { + if (g_str_equal(distro_db[i].codename, "debian")) { /* HACK: Some Debian systems doesn't include the distribuition * name in /etc/debian_release, so add them here. */ if (isdigit(contents[0]) || contents[0] != 'D') diff --git a/pixmaps/distros/deb.png b/pixmaps/distros/deb.png deleted file mode 100644 index fe63aca6..00000000 Binary files a/pixmaps/distros/deb.png and /dev/null differ diff --git a/pixmaps/distros/debian.png b/pixmaps/distros/debian.png new file mode 100644 index 00000000..fe63aca6 Binary files /dev/null and b/pixmaps/distros/debian.png differ -- cgit v1.2.3