diff options
| author | Varriount <Varriount@users.noreply.github.com> | 2017-05-26 02:11:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 02:11:38 -0400 |
| commit | f2bdf3794a108bd5d95759900da1b646f30c0360 (patch) | |
| tree | 972b781cce3e27b2a827e070b51994ff54296389 | |
| parent | 2b8a1cee8cbeddb3e64193a59a78b5d0f46d2fda (diff) | |
| parent | 5b9620bc2d0e8945bcc7adf9f705426980d3b63a (diff) | |
| download | Nim-f2bdf3794a108bd5d95759900da1b646f30c0360.tar.gz | |
Merge pull request #5873 from def-/devel
Invoke xz -9 explicitly instead of trusting tar to interpret XZ_OPT
| -rw-r--r-- | tools/niminst/niminst.nim | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index 67f5e2b33..e4568dc3a 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -679,11 +679,14 @@ RunProgram="tools\downloader.exe" if execShellCmd("7z a -sfx7zS2.sfx -t7z $1.exe $1" % proj) != 0: echo("External program failed (7z)") else: - if execShellCmd("XZ_OPT=-9 gtar Jcf $1.tar.xz $1 --exclude=.DS_Store" % + if execShellCmd("gtar cf $1.tar $1 --exclude=.DS_Store" % proj) != 0: # try old 'tar' without --exclude feature: - if execShellCmd("XZ_OPT=-9 tar Jcf $1.tar.xz $1" % proj) != 0: + if execShellCmd("tar cf $1.tar $1" % proj) != 0: echo("External program failed") + + if execShellCmd("xz -9f $1.tar" % proj) != 0: + echo("External program failed") finally: setCurrentDir(oldDir) |