koch now ignores the existance of .git and always builds the latest tagged stable release of Nimble unless you use the --latest switch; fixes #11402; fixes #9017

1 files changed, 4 insertions, 9 deletions

diff --git a/koch.nim b/koch.nim
index 4fb58ef81..3d52d6f38 100644
--- a/koch.nim
+++ b/koch.nim
@@ -41,7 +41,7 @@ Usage:
 Options:
   --help, -h               shows this help and quits
   --latest                 bundle the installers with a bleeding edge Nimble
-  --stable                 bundle the installers with a stable Nimble
+  --stable                 bundle the installers with a stable Nimble (default)
 Possible Commands:
   boot [options]           bootstraps with given command line options
   distrohelper [bindir]    helper for distro packagers
@@ -583,18 +583,13 @@ proc showHelp() =
 when isMainModule:
   var op = initOptParser()
   var latest = false
-  var stable = false
-  template isLatest(): bool =
-    if stable: false
-    else:
-      existsDir(".git") or latest
   while true:
     op.next()
     case op.kind
     of cmdLongOption, cmdShortOption:
       case normalize(op.key)
       of "latest": latest = true
-      of "stable": stable = true
+      of "stable": latest = false
       else: showHelp()
     of cmdArgument:
       case normalize(op.key)
@@ -618,13 +613,13 @@ when isMainModule:
       of "temp": temp(op.cmdLineRest)
       of "xtemp": xtemp(op.cmdLineRest)
       of "wintools": bundleWinTools()
-      of "nimble": buildNimble(isLatest())
+      of "nimble": buildNimble(latest)
       of "nimsuggest": bundleNimsuggest()
       of "toolsnonimble":
         buildTools()
       of "tools":
         buildTools()
-        buildNimble(isLatest())
+        buildNimble(latest)
       of "pushcsource", "pushcsources": pushCsources()
       of "valgrind": valgrind(op.cmdLineRest)
       of "c2nim": bundleC2nim()