From 409d6d09310078a8b294084eeedf790f8e6fea1e Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 13 Jul 2017 22:42:14 +0200 Subject: [PATCH] Added Unity7 (ubuntu 17.04) desktop env. --- src/dorkbox/util/OSUtil.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/dorkbox/util/OSUtil.java b/src/dorkbox/util/OSUtil.java index 81dc394..1dc94cd 100644 --- a/src/dorkbox/util/OSUtil.java +++ b/src/dorkbox/util/OSUtil.java @@ -402,6 +402,7 @@ class OSUtil { Gnome, KDE, Unity, + Unity7, XFCE, LXDE, Pantheon, @@ -434,19 +435,23 @@ class OSUtil { if ("unity".equalsIgnoreCase(XDG)) { return Env.Unity; } - else if ("xfce".equalsIgnoreCase(XDG)) { + // Ubuntu Unity7 is a weird combination. It's "Gnome", but it's not "Gnome Shell". + if ("unity:unity7".equalsIgnoreCase(XDG)) { + return Env.Unity7; + } + if ("xfce".equalsIgnoreCase(XDG)) { return Env.XFCE; } - else if ("lxde".equalsIgnoreCase(XDG)) { + if ("lxde".equalsIgnoreCase(XDG)) { return Env.LXDE; } - else if ("kde".equalsIgnoreCase(XDG)) { + if ("kde".equalsIgnoreCase(XDG)) { return Env.KDE; } - else if ("pantheon".equalsIgnoreCase(XDG)) { + if ("pantheon".equalsIgnoreCase(XDG)) { return Env.Pantheon; } - else if ("gnome".equalsIgnoreCase(XDG)) { + if ("gnome".equalsIgnoreCase(XDG)) { return Env.Gnome; }