clean exit codes for all the tools

5 files changed, 29 insertions, 13 deletions

diff --git a/tools/cmerge.nim b/tools/cmerge.nim
index 729a8f218..e461b00b0 100755
--- a/tools/cmerge.nim
+++ b/tools/cmerge.nim
@@ -26,6 +26,6 @@ proc main(dir, outfile: string) =
     quit("Cannot open for writing: " & outfile)
 
 if ParamCount() != 2:
-  echo "Usage: cmerge directory outfile"
+  quit "Usage: cmerge directory outfile"
 else:
   main(ParamStr(1), addFileExt(ParamStr(2), "c"))
diff --git a/tools/nimgrep.nim b/tools/nimgrep.nim
index 4988222d5..eba26465a 100755
--- a/tools/nimgrep.nim
+++ b/tools/nimgrep.nim
@@ -237,8 +237,13 @@ proc walker(dir: string) =
     else: nil
   if existsFile(dir): processFile(dir)
 
-proc writeHelp() = quit(Usage)
-proc writeVersion() = quit(Version)
+proc writeHelp() = 
+  stdout.write(Usage)
+  quit(0)
+
+proc writeVersion() = 
+  stdout.write(Version & "\n")
+  quit(0)
 
 proc checkOptions(subset: TOptions, a, b: string) =
   if subset <= options:
diff --git a/tools/niminst.nim b/tools/niminst.nim
index 0967c1400..c58fa38af 100755
--- a/tools/niminst.nim
+++ b/tools/niminst.nim
@@ -1,7 +1,7 @@
 #
 #
 #        The Nimrod Installation Generator
-#        (c) Copyright 2010 Andreas Rumpf
+#        (c) Copyright 2011 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
@@ -142,8 +142,12 @@ proc parseCmdLine(c: var TConfigData) =
         break
     of cmdLongOption, cmdShortOption:
       case normalize(key)
-      of "help", "h": quit(Usage)
-      of "version", "v": quit(Version)
+      of "help", "h": 
+        stdout.write(Usage)
+        quit(0)
+      of "version", "v": 
+        stdout.write(Version & "\n")
+        quit(0)
       of "o", "output": c.outdir = val
       of "var":
         var idx = val.find('=')
diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index ed9527509..556d9a6e6 100755
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
@@ -1,7 +1,7 @@
 #
 #
 #           Nimrod Website Generator
-#        (c) Copyright 2010 Andreas Rumpf
+#        (c) Copyright 2011 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
@@ -44,7 +44,7 @@ const
   Version = "0.7"
   Usage = "nimweb - Nimrod Website Generator Version " & version & """
 
-  (c) 2009 Andreas Rumpf
+  (c) 2011 Andreas Rumpf
 Usage:
   nimweb [options] ini-file[.ini] [compile_options]
 Options:
@@ -70,8 +70,12 @@ proc parseCmdLine(c: var TConfigData) =
       break
     of cmdLongOption, cmdShortOption:
       case normalize(key)
-      of "help", "h": quit(Usage)
-      of "version", "v": quit(Version)
+      of "help", "h": 
+        stdout.write(Usage)
+        quit(0)
+      of "version", "v": 
+        stdout.write(Version & "\n")
+        quit(0)
       of "o", "output": c.outdir = val
       of "var":
         var idx = val.find('=')
@@ -206,8 +210,11 @@ proc main(c: var TConfigData) =
     var file = c.tabs[i].val
     Exec(cmd % [c.nimrodArgs, file])
     var temp = "web" / changeFileExt(file, "temp")
-    var content = readFile(temp)
-    if isNil(content): quit("[Error] cannot open: " & temp)
+    var content: string
+    try:
+      content = readFile(temp)
+    except EIO:
+      quit("[Error] cannot open: " & temp)
     var f: TFile
     var outfile = "web/upload/$#.html" % file
     if open(f, outfile, fmWrite):
diff --git a/tools/trimcc.nim b/tools/trimcc.nim
index 47dd2a4b4..f74243862 100755
--- a/tools/trimcc.nim
+++ b/tools/trimcc.nim
@@ -26,4 +26,4 @@ proc walker(dir: string) =
 if paramCount() == 1:

   walker(paramStr(1))

 else:

-  echo "Usage: trimcc c_compiler_directory"

+  quit "Usage: trimcc c_compiler_directory"