Add return the last status to if statement.

buty4649 · Jan 16, 2021 · 37bcce5 · 37bcce5
1 parent 27d8756
commit 37bcce5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/bintest/07_if_statement.rb b/bintest/07_if_statement.rb
@@ -53,4 +53,16 @@
       assert_equal("tp2\n", File.read(tp2), command)
     end
   end
+
+  command = "if true; then echo FOO; fi && echo BAR"
+  assert_equal("FOO\nBAR\n", run(command)[0], command)
+
+  command = "if true; then echo FOO; false; fi && echo BAR"
+  assert_equal("FOO\n", run(command)[0], command)
+
+  command = "if false; then echo NG; fi || echo OK"
+  assert_equal("OK\n", run(command)[0], command)
+
+  command = "if true; then echo OK; fi | cat"
+  assert_equal("OK\n", run(command)[0], command)
 end
diff --git a/mrblib/reddish/executor.rb b/mrblib/reddish/executor.rb
@@ -165,6 +165,9 @@ def if_statement(statement)
         elsif statement.cmd2
           exec(statement.cmd2)
         end
+
+        # return last status
+        $?
       end
     end