Don't abort if embryo_cc's return code is 1.

[redact.git] / lib / redact / app.rb

diff --git a/lib/redact/app.rb b/lib/redact/app.rb
index 7c5f39ee69334d8c2533712c142c95e7e32f1353..dc9ef9b52b4d52bb8fb8697e0a0cd1f26c452eeb 100644 (file)
--- a/lib/redact/app.rb
+++ b/lib/redact/app.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: app.rb 3 2005-03-26 19:21:15Z tilman $
+# $Id: app.rb 39 2005-04-28 21:08:11Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -110,11 +110,7 @@ module Redact
                                end
 
                                o.on_tail("--version", "Show version") do
-                                       puts <<EOT
-redact #{Redact::VERSION}
-
-Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
-EOT
+                                       puts "Redact #{Redact::VERSION}"
                                        exit
                                end
 
@@ -139,8 +135,9 @@ EOT
                                                c = "embryo_cc " +
                                                    "-i #{incl}/include " +
                                                    "-o #{tf_out.path} #{tf_in.path}"
-                                               unless system(c)
-                                                       fail("Cannot compile Embryo code")
+                                               system(c)
+                                               unless (0..1).include?($?.exitstatus)
+                                                       raise("Cannot compile Embryo code")
                                                end
 
                                                ret[col.id] = tf_out.read
@@ -210,7 +207,7 @@ EOT
                                method = (sane == @filename) ? :unshift : :push
                                s.send(method, SourceFile.new(sane, value.join))
 
-                               # include files that are with File.read, too
+                               # include files that are read with File.read, too
                                value.join.grep(/File\.read\(\"(.+)\"\)/) do
                                        sane = Pathname.new($1).cleanpath.to_s
                                        s << SourceFile.new(sane, File.read(sane))