--- module/setup.py +++ module/setup.py @@ -145,15 +145,6 @@ return False print "" - print _("Do you want to change the config path? Current is %s") % os.path.abspath("") - print _( - "If you use pyLoad on a server or the home partition lives on an internal flash it may be a good idea to change it.") - path = self.ask(_("Change config path?"), self.no, bool=True) - if path: - self.conf_path() - #calls exit when changed - - print "" print _("Do you want to configure login data and basic settings?") print _("This is recommend for first run.") con = self.ask(_("Make basic setup?"), self.yes, bool=True) @@ -397,29 +388,6 @@ if not noaction: db.shutdown() - def conf_path(self, trans=False): - if trans: - gettext.setpaths([os.path.join(os.sep, "usr", "share", "pyload", "locale"), None]) - translation = gettext.translation("setup", os.path.join(self.path, "locale"), - languages=[self.config["general"]["language"], "en"], fallback=True) - translation.install(True) - - print _("Setting new configpath, current configuration will not be transfered!") - path = self.ask(_("Configpath"), os.path.abspath("")) - try: - path = os.path.join(pypath, path) - if not os.path.exists(path): - os.makedirs(path) - f = open(os.path.join(pypath, "module", "config", "configdir"), "wb") - f.write(path) - f.close() - print _("Configpath changed, setup will now close, please restart to go on.") - print _("Press Enter to exit.") - raw_input() - exit() - except Exception, e: - print _("Setting config path failed: %s") % str(e) - def print_dep(self, name, value): """Print Status of dependency""" if value: --- pyLoadCore.py +++ pyLoadCore.py @@ -91,7 +91,7 @@ try: options, args = getopt(argv[1:], 'vchdusqp:', ["version", "clear", "clean", "help", "debug", "user", - "setup", "configdir=", "changedir", "daemon", + "setup", "configdir=", "daemon", "quit", "status", "no-remote","pidfile="]) for option, argument in options: @@ -123,13 +123,6 @@ s = Setup(pypath, self.config) s.start() exit() - elif option == "--changedir": - from module.setup import Setup - - self.config = ConfigParser() - s = Setup(pypath, self.config) - s.conf_path(True) - exit() elif option in ("-q", "--quit"): self.quitInstance() exit() @@ -170,7 +163,6 @@ print " -s, --setup", " " * 12, "Run Setup Assistent" print " --configdir=", " " * 6, "Run with as config directory" print " -p, --pidfile=", " " * 3, "Set pidfile to " - print " --changedir", " " * 12, "Change config dir permanently" print " --daemon", " " * 15, "Daemonize after start" print " --no-remote", " " * 12, "Disable remote access (saves RAM)" print " --status", " " * 15, "Display pid if running or False"