diff options
Diffstat (limited to 'start.py')
| -rwxr-xr-x | start.py | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -42,7 +42,6 @@ arg_parser.add_argument("--module", "-m", help="Execute an action against a specific module") arg_parser.add_argument("--module-args", "-M", help="Arguments to give in action against a specific module") -arg_parser.add_argument("--external", "-e", help="External modules directory") arg_parser.add_argument("--startup-disconnects", "-D", help="Tolerate failed connections on startup", action="store_true") @@ -88,12 +87,8 @@ events = EventManager.EventRoot(log).wrap() exports = Exports.Exports() timers = Timers.Timers(database, events, log) -module_directories = [os.path.join(directory, "modules")] -if args.external: - module_directories.append(os.path.abspath(args.external)) -if "external-modules" in config: - module_directories.append(os.path.abspath(config["external-modules"])) - +module_directories = [os.path.join(directory, "modules"), + os.path.join(directory, "external_modules")] modules = ModuleManager.ModuleManager(events, exports, timers, config, log, module_directories) |