diff options
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | lib/pure/os.nim | 18 | ||||
| -rw-r--r-- | tests/stdlib/tos.nim | 6 |
3 files changed, 16 insertions, 12 deletions
diff --git a/changelog.md b/changelog.md index 0d7030cd4..4080f789c 100644 --- a/changelog.md +++ b/changelog.md @@ -234,8 +234,8 @@ - Added `ZZZ` and `ZZZZ` patterns to `times.nim` `DateTime` parsing, to match time zone offsets without colons, e.g. `UTC+7 -> +0700`. -- In `std/os`, `getHomeDir` and `expandTilde` now do not include trailing `DirSep`, unless `-d:nimLegacyHomeDir` is specified - (for a transition period). +- In `std/os`, `getHomeDir`, `expandTilde`, `getTempDir`, `getConfigDir` now do not include trailing `DirSep`, + unless `-d:nimLegacyHomeDir` is specified (for a transition period). ## Language changes diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 00a5f9342..d0b3aef1a 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -917,10 +917,7 @@ proc getConfigDir*(): string {.rtl, extern: "nos$1", ## On non-Windows OSs, this proc conforms to the XDG Base Directory ## spec. Thus, this proc returns the value of the `XDG_CONFIG_HOME` environment ## variable if it is set, otherwise it returns the default configuration - ## directory ("~/.config/"). - ## - ## An OS-dependent trailing slash is always present at the end of the - ## returned string: `\\` on Windows and `/` on all other OSs. + ## directory ("~/.config"). ## ## See also: ## * `getHomeDir proc <#getHomeDir>`_ @@ -928,12 +925,15 @@ proc getConfigDir*(): string {.rtl, extern: "nos$1", ## * `expandTilde proc <#expandTilde,string>`_ ## * `getCurrentDir proc <#getCurrentDir>`_ ## * `setCurrentDir proc <#setCurrentDir,string>`_ + runnableExamples: + from std/strutils import endsWith + # See `getHomeDir` for behavior regarding trailing DirSep. + assert not getConfigDir().endsWith DirSep when defined(windows): result = getEnv("APPDATA") else: result = getEnv("XDG_CONFIG_HOME", getEnv("HOME") / ".config") - result.normalizePathEnd(trailingSep = true) - + result.normalizePathEnd(trailingSep = defined(nimLegacyHomeDir)) when defined(windows): type DWORD = uint32 @@ -975,6 +975,10 @@ proc getTempDir*(): string {.rtl, extern: "nos$1", ## * `expandTilde proc <#expandTilde,string>`_ ## * `getCurrentDir proc <#getCurrentDir>`_ ## * `setCurrentDir proc <#setCurrentDir,string>`_ + runnableExamples: + from std/strutils import endsWith + # See `getHomeDir` for behavior regarding trailing DirSep. + assert not getTempDir().endsWith(DirSep) const tempDirDefault = "/tmp" when defined(tempDir): const tempDir {.strdefine.}: string = tempDirDefault @@ -995,7 +999,7 @@ proc getTempDir*(): string {.rtl, extern: "nos$1", getTempDirImpl(result) if result.len == 0: result = tempDirDefault - normalizePathEnd(result, trailingSep=true) + result.normalizePathEnd(trailingSep = defined(nimLegacyHomeDir)) proc expandTilde*(path: string): string {. tags: [ReadEnvEffect, ReadIOEffect].} = diff --git a/tests/stdlib/tos.nim b/tests/stdlib/tos.nim index 6651a25db..3f62a098f 100644 --- a/tests/stdlib/tos.nim +++ b/tests/stdlib/tos.nim @@ -549,12 +549,12 @@ block getTempDir: if existsEnv("TMPDIR"): let origTmpDir = getEnv("TMPDIR") putEnv("TMPDIR", "/mytmp") - doAssert getTempDir() == "/mytmp/" + doAssert getTempDir() == "/mytmp" delEnv("TMPDIR") - doAssert getTempDir() == "/tmp/" + doAssert getTempDir() == "/tmp" putEnv("TMPDIR", origTmpDir) else: - doAssert getTempDir() == "/tmp/" + doAssert getTempDir() == "/tmp" block osenv: block delEnv: |