提交 4dd873ac 编写于 作者: N nicolargo

Version 2.8.7

上级 0e66c6b2
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
Glances Version 2 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 Version 2.8.6
============= =============
......
.\" Man page generated from reStructuredText. .\" 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 .SH NAME
glances \- An eye on your system glances \- An eye on your system
. .
......
...@@ -27,7 +27,7 @@ import signal ...@@ -27,7 +27,7 @@ import signal
import sys import sys
# Global name # Global name
__version__ = '2.9.0_DEVELOP' __version__ = '2.8.7'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3' __license__ = 'LGPLv3'
...@@ -221,7 +221,7 @@ def main(): ...@@ -221,7 +221,7 @@ def main():
signal.signal(signal.SIGINT, __signal_handler) signal.signal(signal.SIGINT, __signal_handler)
# Glances can be ran in standalone, client or server mode # 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) start_standalone(config=config, args=args)
elif core.is_client() and not WINDOWS: elif core.is_client() and not WINDOWS:
if core.is_client_browser(): if core.is_client_browser():
......
...@@ -42,7 +42,10 @@ def user_config_dir(): ...@@ -42,7 +42,10 @@ def user_config_dir():
path = os.path.expanduser('~/Library/Application Support') path = os.path.expanduser('~/Library/Application Support')
else: else:
path = os.environ.get('XDG_CONFIG_HOME') or os.path.expanduser('~/.config') 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 return path
...@@ -79,7 +82,10 @@ def system_config_dir(): ...@@ -79,7 +82,10 @@ def system_config_dir():
path = '/usr/local/etc' path = '/usr/local/etc'
else: else:
path = os.environ.get('APPDATA') 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 return path
......
...@@ -226,13 +226,11 @@ Examples of use: ...@@ -226,13 +226,11 @@ Examples of use:
dest='webserver', help='run Glances in web server mode (bottle needed)') dest='webserver', help='run Glances in web server mode (bottle needed)')
parser.add_argument('--cached-time', default=self.cached_time, type=int, 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)) 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,
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')
dest='open_web_browser', help='try to open the Web UI in the default Web browser')
# Display options # Display options
if not WINDOWS: parser.add_argument('-q', '--quiet', default=False, action='store_true',
parser.add_argument('-q', '--quiet', default=False, action='store_true', dest='quiet', help='do not display the curses interface')
dest='quiet', help='do not display the curses interface')
parser.add_argument('-f', '--process-filter', default=None, type=str, parser.add_argument('-f', '--process-filter', default=None, type=str,
dest='process_filter', help='set the process filter pattern (regular expression)') dest='process_filter', help='set the process filter pattern (regular expression)')
parser.add_argument('--process-short-name', action='store_true', default=False, parser.add_argument('--process-short-name', action='store_true', default=False,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册