Fix NPE on trying to compile script files

(There is still no design)

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt

@@ -119,15 +119,13 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
 
         configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: JvmAbi.DEFAULT_MODULE_NAME)
 
+        configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition)
+
         if (arguments.module == null && arguments.freeArgs.isEmpty() && !arguments.version) {
             ReplFromTerminal.run(rootDisposable, configuration)
             return ExitCode.OK
         }
 
-        if (arguments.script) {
-            configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition)
-        }
-
         if (arguments.skipMetadataVersionCheck) {
             JvmMetadataVersion.skipCheck = true
         }

compiler/testData/integration/smoke/compileScript/script.expected

@@ -0,0 +1,2 @@
+
+Return code: 0

compiler/testData/integration/smoke/compileScript/script.kts

@@ -0,0 +1,2 @@
+1 + 1
+

compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java

@@ -64,4 +64,10 @@ public class CompilerSmokeTest extends CompilerSmokeTestBase {
     public void testScriptException() throws Exception {
         runCompiler("script", "-script", "script.kts");
     }
+
+    public void testCompileScript() throws Exception {
+        String jar = tmpdir.getAbsolutePath() + File.separator + "script.jar";
+
+        runCompiler("script", "script.kts", "-d", jar);
+    }
 }