diff --git a/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross b/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross index 4089da1..d6512a2 100644 --- a/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross +++ b/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross @@ -28,7 +28,7 @@ func Tesses.CrossLang.PackageManager() }; } } - var configRoot = Path.FromString(Env.Config) / "Tesses" / "CrossLang"; + var configRoot = Env.CrossLangConfig; var packageCache = configRoot / "PackageCache"; FS.Local.CreateDirectory(packageCache); func FileReadByteArray(fs,path) @@ -98,7 +98,7 @@ func Tesses.CrossLang.PackageManager() { //user has declared they are offline or don't have packageServers look through packages locally var version = new Version(0,0,0,0,"dev"); - var configRoot = Path.FromString(Env.Config) / "Tesses" / "CrossLang"; + var configRoot = Env.CrossLangConfig; var dir = configRoot / "PackageCache" / name; if(FS.Local.DirectoryExists(dir)) each(var f : FS.Local.EnumeratePaths(dir)) diff --git a/Tesses.CrossLang.Shell/src/main.tcross b/Tesses.CrossLang.Shell/src/main.tcross index c64964f..cf33f4e 100644 --- a/Tesses.CrossLang.Shell/src/main.tcross +++ b/Tesses.CrossLang.Shell/src/main.tcross @@ -142,7 +142,7 @@ func main(args) Console.WriteLine("template_name: The name of the template"); Console.WriteLine("directory_for_project: The directory for the project, defaults to current directory"); } - var dir = FS.MakeFull(Env.Config) / "Tesses" / "CrossLang" / "Templates"; + var dir = Env.CrossLangConfig / "Templates"; each(var flag : dd.Flags) { @@ -261,7 +261,7 @@ func main(args) else if(commandName == "install-tool") { //crosslang install-tool Tesses.CrossLang.Tool.SomeTool --version=1.0.0.0-prod - var toolsDir = Path.FromString(Env.Config) / "Tesses" / "CrossLang" / "Tools"; + var toolsDir = Env.CrossLangConfig / "Tools"; var offline=false; var buildPath = "."; @@ -392,7 +392,7 @@ func main(args) else if(commandName == "tool") { - var dir = FS.MakeFull(Env.Config) / "Tesses" / "CrossLang" / "Tools"; + var dir = Env.CrossLangConfig / "Tools"; if(dd.Arguments.Length == 1) { Console.WriteLine("List of tools:"); @@ -501,7 +501,7 @@ func main(args) } else if(commandName == "configdir") { - Console.WriteLine(FS.MakeFull(Env.Config) / "Tesses" / "CrossLang"); + Console.WriteLine(Env.CrossLangConfig); } } diff --git a/crosslang_shell_archive_maker/src/main.tcross b/crosslang_shell_archive_maker/src/main.tcross index 74f6366..793f07f 100644 --- a/crosslang_shell_archive_maker/src/main.tcross +++ b/crosslang_shell_archive_maker/src/main.tcross @@ -11,7 +11,7 @@ func main(args) func install() { - var d = FS.MakeFull(Env.Config) / "Tesses" / "CrossLang"; + var d = Env.CrossLangConfig; FS.Local.CreateDirectory(d); var sdfs = FS.SubdirFilesystem(FS.Local, d); var strm = FS.Local.OpenFile(name,"rb");