Makefile

@@ -4,14 +4,12 @@ VARDIR ?= /var/lib/containerctl
 GENERATEDIR ?= $(VARDIR)/generate
 CONFIGDIR ?= $(VARDIR)/configs
 CONTAINERDIR ?= $(VARDIR)/containers
-ENVDIR ?= $(VARDIR)/environment-files
 
 install:
 	mkdir -p \
 		$(PREFIX)$(GENERATEDIR) \
 		$(PREFIX)$(CONFIGDIR) \
 		$(PREFIX)$(CONTAINERDIR) \
-		$(PREFIX)$(ENVDIR) \
 		$(PREFIX)$(BINDIR)
 	install -m755 containerctl $(PREFIX)$(BINDIR)
 	cp -t $(PREFIX)$(GENERATEDIR) \

generate/container.py

@@ -639,8 +639,8 @@ class Container:
         self.dns = Dns.from_json(dns, logger)
         self.ports = Ports.from_json(ports, logger)
         self.env = Environment.from_json(env, logger)
-        self.env.file = "/var/lib/containerctl/environment-files/"
-        self.env.file += f"{self.name}"
+        self.env.file = "/var/lib/containerctl/containers/"
+        self.env.file += f"{self.name}/environment"
         self.secrets = Secret.from_json(secrets, logger)
         self.volumes = Volume.from_json(volumes, logger)
         self.capabilities = Capability.from_json(capabilities, logger)

generate/generate.py

@@ -14,7 +14,7 @@ from pathlib import Path
 from container import ConfigError, Container
 from log import Log
 
-GENERATE_VERSION = "0.0.7"
+GENERATE_VERSION = "0.0.6"
 HEADER = f"""#!/bin/sh
 # This script was generated by containerctl v{GENERATE_VERSION}
 # Report bugs with _this script_ to <tenno+containerctl@suij.in>
@@ -109,7 +109,7 @@ def main() -> None:
             script_content += ct.create_environment()
         script_content += method()
         if script_content == "":
-            script_content = "true\n"
+            script_content = "true"
         with s.open("w+", encoding="utf-8") as f:
             f.write(HEADER)
             f.write(script_content)