From 90a93e413271eab882f12d42905ac6e97a25ba7f Mon Sep 17 00:00:00 2001
From: Vasilij Schneidermann <v.schneidermann@gmail.com>
Date: Mon, 8 Aug 2016 01:09:39 +0200
Subject: [PATCH] Move run_chuck.rb to run

---
 chuck/run          | 23 +++++++++++++++++++++--
 chuck/run_chuck.rb | 14 --------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 rewrite chuck/run (100%)
 delete mode 100755 chuck/run_chuck.rb

diff --git a/chuck/run b/chuck/run
dissimilarity index 100%
index e90e1295..55670626 100755
--- a/chuck/run
+++ b/chuck/run
@@ -1,2 +1,21 @@
-#!/bin/bash
-exec ./run_chuck.rb --silent $(dirname $0)/${STEP:-stepA_mal}.ck "${@}"
+#!/usr/bin/env ruby
+
+cmdline = ['chuck', '--caution-to-the-wind', '--silent']
+
+# HACK: makes `make MAL_IMPL=chuck "test^mal"` work
+scriptpath = File.expand_path(File.dirname(__FILE__))
+Dir.chdir(scriptpath)
+
+scriptfile = (ENV['STEP'] || 'stepA_mal') + '.ck'
+
+script = File.readlines(scriptfile)
+imports = script.grep(%r{^ *// *@import (.+)}) { $1 }
+import_files = imports.flat_map { |i| Dir[i] }
+cmdline += import_files
+cmdline << scriptfile
+
+File.write('/tmp/chuck-cmdline', cmdline.join(' '))
+File.write('/tmp/chuck-args', ARGV.join(' '))
+
+ENV['CHUCK_ARGS'] = ARGV.join("\a")
+exec(*cmdline)
diff --git a/chuck/run_chuck.rb b/chuck/run_chuck.rb
deleted file mode 100755
index 82ed1eb4..00000000
--- a/chuck/run_chuck.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-cmdline = ['chuck', '--caution-to-the-wind']
-cmdline << ARGV.shift if ARGV[0] == '--silent'
-
-scriptfile = ARGV[0]
-script = File.readlines(scriptfile)
-imports = script.grep(%r{^ *// *@import (.+)}) { $1 }
-import_files = imports.flat_map { |i| Dir[i] }
-cmdline += import_files
-cmdline << scriptfile
-
-ENV['CHUCK_ARGS'] = ARGV.drop(1).join("\a")
-exec(*cmdline)
-- 
2.20.1