nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-26 02:31:36 +03:00
Code Issues Projects Releases Wiki Activity

Version 2.8.7

Browse Source
This commit is contained in:
nicolargo 2017-03-12 07:38:03 +01:00
parent 0e66c6b23e
commit 4dd873ac0e
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -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
=============

2
docs/man/glances.1
View File

@ -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
.

4
glances/__init__.py
View File

@ -27,7 +27,7 @@ import signal
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():

10
glances/config.py
View File

@ -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

10
glances/main.py
View File

@ -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,