Skip to content

Commit bffca2e

Browse files
committed
use getCacheDir("nimdigger") instead of ~/.nimdigger/cache
1 parent 8cb3e43 commit bffca2e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/nimdigger.nim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ care of details such as figuring out automatically the correct csources/csources
1212
build at any revision >= v0.12.0~157
1313
```bash
1414
$ nim r tools/nimdigger.nim --compileNim --rev:v0.15.2~10
15-
$ $HOME/.nimdigger/cache/Nim/bin/nim -v
15+
$ $NIMDIGGER_CACHE/Nim/bin/nim -v
1616
Nim Compiler Version 0.15.2 (2021-05-28) [MacOSX: amd64] [...]
1717
```
1818
@@ -107,7 +107,7 @@ const
107107
csourcesRevs = "v0.9.4 v0.13.0 v0.15.2 v0.16.0 v0.17.0 v0.17.2 v0.18.0 v0.19.0 v0.20.0".split &
108108
"64e34778fa7e114b4afc753c7845dee250584167"
109109
csourcesV1Revs = "a8a5241f9475099c823cfe1a5e0ca4022ac201ff".split
110-
NimDiggerEnv = "NIMDIGGER_HOME"
110+
NimDiggerEnv = "NIMDIGGER_CACHE"
111111
ExeExt2 = when ExeExt.len > 0: "." & ExeExt else: ""
112112

113113
var verbose = false
@@ -156,7 +156,7 @@ proc gitCleanDanger(dir: string, requireConfirmation = true) =
156156
This is needed to avoid `git bisect` aborting with this error: The following untracked working tree files would be overwritten by checkout.
157157
For example, this would happen in cases like this:
158158
```
159-
cd $HOME/.nimdigger/cache/Nim
159+
cd $NIMDIGGER_CACHE/Nim
160160
git checkout abaa42fd8a239ea62ddb39f6f58c3180137d750c
161161
touch testament/testamenthtml.templ
162162
cd -
@@ -258,8 +258,8 @@ proc getCsourcesState(state: DiggerState): CsourcesState =
258258
proc main2(opt: DiggerOpt) =
259259
let state = DiggerState(nimDir: opt.nimDir, rev: opt.rev)
260260
if state.nimDir.len == 0:
261-
let nimdiggerHome = getEnv(NimDiggerEnv, getHomeDir() / ".nimdigger")
262-
state.nimDir = nimdiggerHome / "cache/Nim"
261+
let nimdiggerCache = getEnv(NimDiggerEnv, getCacheDir("nimdigger"))
262+
state.nimDir = nimdiggerCache / "Nim"
263263
if verbose: dbg state
264264
let nimDir = state.nimDir
265265
state.binDir = nimDir/"bin"

0 commit comments

Comments
 (0)