From 83d8d203685cac3f5aed3872897463c7afa50810 Mon Sep 17 00:00:00 2001 From: godofdream Date: Mon, 5 Nov 2012 15:15:17 +0100 Subject: new Setup system, JQuery Web-If --- pyLoadCore.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pyLoadCore.py') diff --git a/pyLoadCore.py b/pyLoadCore.py index a44e9a2d5..f005d9208 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -117,21 +117,24 @@ class Core(object): elif option in ("-d", "--debug"): self.doDebug = True elif option in ("-u", "--user"): - from module.setup import Setup + from module.setup.Setup import Setup self.config = ConfigParser() s = Setup(pypath, self.config) s.set_user() exit() elif option in ("-s", "--setup"): - from module.setup import Setup + from module.setup.Setup import Setup self.config = ConfigParser() s = Setup(pypath, self.config) - s.start() + if argument == "web": + s.start_web() + else: + s.start() exit() elif option == "--changedir": - from module.setup import Setup + from module.setup.Setup import Setup self.config = ConfigParser() s = Setup(pypath, self.config) @@ -282,7 +285,7 @@ class Core(object): self.version = CURRENT_VERSION if not exists("pyload.conf") and not tests: - from module.setup import Setup + from module.setup.Setup import Setup print "This is your first start, running configuration assistant now." self.config = ConfigParser() -- cgit v1.2.3