diff options
| author | genotrance <dev@genotrance.com> | 2018-06-23 19:23:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-23 19:23:33 -0500 |
| commit | d943f117c4860eb5f069212989e73f17b981881d (patch) | |
| tree | 8685c2b7f2663f1fda1074be427c708a2f1aa357 | |
| parent | 88a57e5452c79328a145f8a76e7c9ad32ad1ed94 (diff) | |
| parent | 4a83f6d5a1177396cd9f0287bc3f99e9ca0a7e87 (diff) | |
| download | nimgen-d943f117c4860eb5f069212989e73f17b981881d.tar.gz nimgen-d943f117c4860eb5f069212989e73f17b981881d.zip | |
Merge pull request #5 from jyapayne/allow_deeper_output
Allow for deeper than one directory paths for the output directory
| -rw-r--r-- | nimgen.nim | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -4,6 +4,7 @@ var gDoneRecursive: seq[string] = @[] gDoneInline: seq[string] = @[] + gProjectDir = "" gConfig: Config gFilter = "" gQuotes = true @@ -59,7 +60,7 @@ proc extractZip(zipfile: string) = cmd = "powershell -nologo -noprofile -command \"& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('$#', '.'); }\"" setCurrentDir(gOutput) - defer: setCurrentDir("..") + defer: setCurrentDir(gProjectDir) echo "Extracting " & zipfile discard execProc(cmd % zipfile) @@ -84,7 +85,7 @@ proc gitReset() = echo "Resetting Git repo" setCurrentDir(gOutput) - defer: setCurrentDir("..") + defer: setCurrentDir(gProjectDir) discard execProc("git reset --hard HEAD") @@ -95,7 +96,7 @@ proc gitRemotePull(url: string, pull=true) = return setCurrentDir(gOutput) - defer: setCurrentDir("..") + defer: setCurrentDir(gProjectDir) echo "Setting up Git repo" discard execProc("git init .") @@ -112,7 +113,7 @@ proc gitSparseCheckout(plist: string) = return setCurrentDir(gOutput) - defer: setCurrentDir("..") + defer: setCurrentDir(gProjectDir) discard execProc("git config core.sparsecheckout true") writeFile(sparsefile, plist) @@ -650,6 +651,8 @@ proc runCfg(cfg: string) = echo "Config doesn't exist: " & cfg quit(1) + gProjectDir = parentDir(cfg.expandFilename()) + gConfig = loadConfig(cfg) if gConfig.hasKey("n.global"): |