Merge branch 'master' into paraboley

# Conflicts:
#	paraboley

1 files changed, 6 insertions, 2 deletions

diff --git a/paraboley b/paraboley
index 3f7667f..0f9ce61 100755
--- a/paraboley
+++ b/paraboley
@@ -3,7 +3,7 @@
 # Paraboley is a forked made by Aurélien DESBIRÈRES <aurelien@hackers.camp>
 # of archey3 to present the Parabola GNU / Linux-libre logo and informations
 #
-# paraboley [version 0.2] 
+# paraboley
 #
 # Distributed under the terms of the GNU General Public License v3.
 # See http://www.gnu.org/licenses/gpl.txt for the full license text.
@@ -11,6 +11,8 @@
 # Simple python script to display an Parabola logo in ASCII art
 # Along with basic system information.
 
+__version__ = "0.3"
+
 # Import libraries
 
 import collections
@@ -85,6 +87,7 @@ def module_register(name):
 DE_DICT = collections.OrderedDict([
         ('cinnamon', 'Cinnamon'),
         ('gnome-session', 'GNOME'),
+        ('gnome-shell', 'GNOME'),
         ('ksmserver', 'KDE'),
         ('mate-session', 'MATE'),
         ('xfce4-session', 'Xfce'),
@@ -102,6 +105,7 @@ WM_DICT = collections.OrderedDict([
         ('fvwm', 'FVWM'),
         ('herbstluftwm', 'herbstluftwm'),
         ('i3', 'i3'),
+        ('sway', 'sway'),
         ('icewm', 'IceWM'),
         (re.compile('kwin(_x11|_wayland)?'), 'KWin'),
         ('metacity', 'Metacity'),
@@ -824,7 +828,7 @@ def main():
         usage='%prog',
         description="""%prog is a utility to display system info and take\
  screenshots""",
-        version="%prog 0.3")
+        version="%prog {version}".format(version=__version__))
     parser.add_option('-c', '--color',
             action='store', type='choice', dest='color',
             choices=('black',