Version 2.8.7

nicolargo · Mar 12, 2017 · 4dd873a · 4dd873a
1 parent 0e66c6b
commit 4dd873a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/NEWS b/NEWS
@@ -2,10 +2,12 @@
 Glances Version 2
 ==============================================================================
 
-Version 2.9.0
+Version 2.8.7
 =============
 
+Bugs corrected:
 
+    * Windows OS - Global name standalone not defined again (#1030)
 
 Version 2.8.6
 =============

diff --git a/docs/man/glances.1 b/docs/man/glances.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GLANCES" "1" "Mar 10, 2017" "2.8.5" "Glances"
+.TH "GLANCES" "1" "Mar 12, 2017" "2.8.7" "Glances"
 .SH NAME
 glances \- An eye on your system
 .

diff --git a/glances/__init__.py b/glances/__init__.py
@@ -27,7 +27,7 @@
 import sys
 
 # Global name
-__version__ = '2.9.0_DEVELOP'
+__version__ = '2.8.7'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPLv3'
 
@@ -221,7 +221,7 @@ def main():
     signal.signal(signal.SIGINT, __signal_handler)
 
     # Glances can be ran in standalone, client or server mode
-    if core.is_standalone()and not WINDOWS:
+    if core.is_standalone() and not WINDOWS:
         start_standalone(config=config, args=args)
     elif core.is_client() and not WINDOWS:
         if core.is_client_browser():

diff --git a/glances/config.py b/glances/config.py
@@ -42,7 +42,10 @@ def user_config_dir():
         path = os.path.expanduser('~/Library/Application Support')
     else:
         path = os.environ.get('XDG_CONFIG_HOME') or os.path.expanduser('~/.config')
-    path = os.path.join(path, 'glances')
+    if path is None:
+        path = ''
+    else:
+        path = os.path.join(path, 'glances')
 
     return path
 
@@ -79,7 +82,10 @@ def system_config_dir():
         path = '/usr/local/etc'
     else:
         path = os.environ.get('APPDATA')
-    path = os.path.join(path, 'glances')
+    if path is None:
+        path = ''
+    else:
+        path = os.path.join(path, 'glances')
 
     return path
 

diff --git a/glances/main.py b/glances/main.py
@@ -226,13 +226,11 @@ def init_args(self):
                             dest='webserver', help='run Glances in web server mode (bottle needed)')
         parser.add_argument('--cached-time', default=self.cached_time, type=int,
                             dest='cached_time', help='set the server cache time [default: {} sec]'.format(self.cached_time))
-        if not WINDOWS:
-            parser.add_argument('--open-web-browser', action='store_true', default=False,
-                                dest='open_web_browser', help='try to open the Web UI in the default Web browser')
+        parser.add_argument('--open-web-browser', action='store_true', default=False,
+                            dest='open_web_browser', help='try to open the Web UI in the default Web browser')
         # Display options
-        if not WINDOWS:
-            parser.add_argument('-q', '--quiet', default=False, action='store_true',
-                                dest='quiet', help='do not display the curses interface')
+        parser.add_argument('-q', '--quiet', default=False, action='store_true',
+                            dest='quiet', help='do not display the curses interface')
         parser.add_argument('-f', '--process-filter', default=None, type=str,
                             dest='process_filter', help='set the process filter pattern (regular expression)')
         parser.add_argument('--process-short-name', action='store_true', default=False,