aboutsummaryrefslogtreecommitdiff
path: root/start.py
diff options
context:
space:
mode:
authorGravatar jesopo2019-09-27 16:16:50 +0100
committerGravatar jesopo2019-09-27 16:16:50 +0100
commit514b0126f25fd7948150ec7fcae1d1856497d671 (patch)
treea44537fbf9a6e5121c451126b422405f874ce2f5 /start.py
parentadd !msg (diff)
signature
Revert "add !msg"
This reverts commit ddaf8a38905bfba2e076f9d5c564e5a1e2e2e90f.
Diffstat (limited to 'start.py')
-rwxr-xr-xstart.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/start.py b/start.py
index 19c85719..c6d518a5 100755
--- a/start.py
+++ b/start.py
@@ -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)