Fix path creation with (just) a Project on windows

tecosaur · Feb 12, 2024 · 729a9e3 · 729a9e3
1 parent d6c8e0d
commit 729a9e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/internals.jl b/src/internals.jl
@@ -57,7 +57,7 @@ path seperator of the host filesystem.
 """
 function ensurepath(path::String)
  if !ispath(path)
- if endswith(path, DIRECTORY_SUFFIX_FLAG)
+ if endswith(path, DIRECTORY_SUFFIX_FLAG) || (Sys.iswindows() && endswith(path, "\\"))
  mkpath(path[begin:prevind(path, end)])
  else
  mkpath(dirname(path))

diff --git a/src/nt.jl b/src/nt.jl
@@ -276,13 +276,13 @@ end
 
 projectpath(p::Project, parent::String) =
  joinpath(projectpath(p), if parent === DATA_HOME[] || parent in DATA_DIRS[]
- "data"
+ "data\\"
  elseif parent == CONFIG_HOME[] || parent in CONFIG_DIRS[]
- "config"
+ "config\\"
  elseif parent == CACHE_HOME[]
- "cache"
+ "cache\\"
  elseif parent == STATE_HOME[]
- "state"
+ "state\\"
  else
  ""
  end)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -265,12 +265,12 @@ elseif Sys.iswindows()
  @testset "Projects" begin
  @test BaseDirs.projectpath(BaseDirs.Project("a")) == "julia\\a\\"
  @test BaseDirs.projectpath(BaseDirs.Project("a", org="b")) == "b\\a\\"
- @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.DATA_HOME[]) == "julia\\a\\data"
+ @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.DATA_HOME[]) == "julia\\a\\data\\"
  if BaseDirs.CONFIG_HOME[] != BaseDirs.DATA_HOME[]
- @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.CONFIG_HOME[]) == "julia\\a\\config"
+ @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.CONFIG_HOME[]) == "julia\\a\\config\\"
  end
- @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.CACHE_HOME[]) == "julia\\a\\cache"
- @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.STATE_HOME[]) == "julia\\a\\state"
+ @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.CACHE_HOME[]) == "julia\\a\\cache\\"
+ @test BaseDirs.projectpath(BaseDirs.Project("a"), BaseDirs.STATE_HOME[]) == "julia\\a\\state\\"
  end
  @test isnothing(BaseDirs.reload())
 end