From 4dd873ac0e269b6597d2de26cd2fe104e4f11437 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sun, 12 Mar 2017 07:38:03 +0100 Subject: [PATCH] Version 2.8.7 --- NEWS | 4 +++- docs/man/glances.1 | 2 +- glances/__init__.py | 4 ++-- glances/config.py | 10 ++++++++-- glances/main.py | 10 ++++------ 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index 6d31e00a..8fa6c5bf 100644 --- 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 index 08a717a8..7b7540dc 100644 --- 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 index 2a196ba9..edf2ab66 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -27,7 +27,7 @@ import signal import sys # Global name -__version__ = '2.9.0_DEVELOP' +__version__ = '2.8.7' __author__ = 'Nicolas Hennion ' __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 index 4698e9e9..ad58537c 100644 --- 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 index 0c1c3dda..d2bf30c9 100644 --- a/glances/main.py +++ b/glances/main.py @@ -226,13 +226,11 @@ Examples of use: 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,