Various build fixes, cleanup and details #6

Merged
leo merged 34 commits from trace into main 2023-11-21 15:32:49 +00:00
Showing only changes of commit a1029d2c55 - Show all commits

View File

@ -50,7 +50,6 @@ def main():
def _main(): def _main():
args = docopt(doc) args = docopt(doc)
config.init_confdir()
if args["--user"]: if args["--user"]:
return _user(args) return _user(args)
listen = args["-l"] listen = args["-l"]
@ -120,7 +119,7 @@ def _confdir(args):
# Accidentally pointed to the db.toml, use parent # Accidentally pointed to the db.toml, use parent
confdir = confdir.parent confdir = confdir.parent
os.environ["CISTA_HOME"] = confdir.as_posix() os.environ["CISTA_HOME"] = confdir.as_posix()
config.conffile = confdir / config.conffile.name config.init_confdir() # Uses environ if available
def _user(args): def _user(args):