diff --git a/glances/main.py b/glances/main.py index 0220b3b7..03acfd7a 100644 --- a/glances/main.py +++ b/glances/main.py @@ -111,7 +111,7 @@ Examples of use: parser.add_argument('-V', '--version', action='version', version=version) parser.add_argument('-d', '--debug', action='store_true', default=False, dest='debug', help='enable debug mode') parser.add_argument('-C', '--config', dest='conf_file', help='path to the configuration file') - parser.add_argument('-P', '--plugins', dest='plugin_path', help='path to additional plugin directory') + parser.add_argument('-P', '--plugins', dest='plugin_dir', help='path to additional plugin directory') # Disable plugin parser.add_argument( '--modules-list', diff --git a/glances/stats.py b/glances/stats.py index d861a471..31b88d2b 100644 --- a/glances/stats.py +++ b/glances/stats.py @@ -149,14 +149,20 @@ class GlancesStats(object): return _plugin_list + path = None # Skip section check as implied by has_option if config and config.parser.has_option('global', 'plugin_dir'): path = config.parser['global']['plugin_dir'] + + if args and 'plugin_dir' in args: + path = args.plugin_path + + if path: # Get list before starting the counter _sys_path = sys.path start_duration = Counter() # Ensure that plugins can be found in plugin_dir - sys.path.insert(1, path) + sys.path.insert(0, path) for plugin in get_addl_plugins(self, path): start_duration.reset() try: