diff --git a/dub.sdl b/dub.sdl index 171c298..100692f 100644 --- a/dub.sdl +++ b/dub.sdl @@ -9,6 +9,5 @@ dependency "vibe-d:http" version="0.8.6-beta.1" dependency "asdf" version="~>0.4.7" dependency "vibe-d:inet" version="0.8.6-beta.1" dependency "vibe-d:core" version="0.8.6-beta.1" -dependency "standardpaths" version="~>0.8.1" targetType "executable" targetPath "bin" diff --git a/source/aim/common/util.d b/source/aim/common/util.d index 985d080..55acb93 100644 --- a/source/aim/common/util.d +++ b/source/aim/common/util.d @@ -8,6 +8,14 @@ private public import std.path : PATH = buildNormalizedPath; +string CONFIG_PATH(string appName, string path) +{ + version(linux) + return PATH("/etc/", appName, path); + else + return PATH(".aim/config/", appName, path); +} + const DIR_GIT_KEEP = ".aim/git_keep/"; const DIR_GIT_IGNORE = ".aim/git_ignore/"; diff --git a/source/app.d b/source/app.d index 0be1aca..78457b9 100644 --- a/source/app.d +++ b/source/app.d @@ -2,7 +2,6 @@ import jaster.cli.core, jaster.cli.util; import std.algorithm : any; import aim.secrets, aim.common, aim.deploy, aim.daemon; import jaster.ioc; -import standardpaths; int main(string[] args) { @@ -11,7 +10,7 @@ int main(string[] args) cliConfigure!AimSecretsConfig(AimSecretsConfig.CONF_FILE), cliConfigure!AimSecretsDefineValues(AimSecretsDefineValues.CONF_FILE), cliConfigure!AimDeployConfig(AimDeployConfig.CONF_FILE), - cliConfigure!AimDaemonConfig(writablePath(StandardPath.config, "aimcli", FolderFlag.create)), + cliConfigure!AimDaemonConfig(CONFIG_PATH("aimcli", "daemon.json")), ServiceInfo.asSingleton!(IFileDownloader, FileDownloader), ServiceInfo.asScoped!(IDeployHandlerFactory, DeployHandlerFactory), ServiceInfo.asScoped!(IAimDeployAddonFactory, AimDeployAddonFactory),