Skip to content

Commit c19f659

Browse files
committed
* Documentation update
* Fixed REPL Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>
1 parent d5720d2 commit c19f659

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

NEWS.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44

55
Enhancements
66

7-
* New Github organization 'kscripting'
7+
* New GitHub organization: [kscripting](http://github.com/kscripting)
88
* Change the name of kscript package to io.github.kscripting:kscript
99
* Final execution of script is handled by kscript, not by bash (reduces dependency on bash)
1010
* Separate library for shell execution kscripting/shell
1111
* Deprecate old annotations in kscript-annotations library
12-
* Change the way of checking latest kscript version (will simplify releases)
13-
* SNAPSHOT versions are handled correctly by VersionChecker
14-
* Improved ConfigBuilder implementation
12+
* Change the way of checking latest kscript version (simplifies releases)
13+
* Improved implementation: VersionChecker, ConfigBuilder etc.
1514
* Updated Gradle and dependencies
1615
* Deprecated @file:Include in favour of @file:Import as a preparation of switch to Kotlin Scripting
1716
* Get rid of docopt handler from KscriptHandler (helps with using kscript as library)
1817
* Changed the way of creating distribution package - now it is handled by Gradle
19-
* Version of kscript is set by Gradle (generated BuildConfig)
18+
* Version of kscript is set by Gradle (generated BuildConfig class)
2019
* Improved DependencyResolver: aar archives are also included in classpath
2120
* Gradle and Idea are no more needed for generation of IntelliJ project
2221

22+
Bugfixes
23+
24+
* Fixed exit code on Windows
25+
2326
## 4.1.0
2427

2528
Breaking changes

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -477,20 +477,21 @@ Boostrap IDEA from a `kscript`let
477477

478478
Artifacts and versions will differ between scripts, so it is hard to maintain them all in a single project. To
479479
nevertheless provide optimal tooling when scripting with Kotlin `kscript` allows to create temporary projects
480-
for `<script>` arguments. .
480+
for `<script>` arguments.
481481

482482
```bash
483483
kscript --idea CountRecords.kts
484484
```
485485

486-
This will open [IntelliJ IDEA](https://www.jetbrains.com/idea/) with a minimalistic project containing just your (
487-
1) `<script>` and (2) a generated `gradle.build` file:
486+
If you have available `gradle` in the path project will be automatically built and if there is `idea` in the path
487+
the project will be opened in [IntelliJ IDEA](https://www.jetbrains.com/idea/) with a minimalistic project containing
488+
just your (1) `<script>` and (2) a generated `build.gradle.kts` file:
488489

489490
![](misc/readme_images/minus_idea.png)
490491

491-
This assumes that you have the Intellij IDEA command line launcher `idea` in your `PATH`. It can be created in IntelliJ
492-
under `Tools -> Create Command-line Launcher` or you can set the command used to launch your intellij
493-
as `KSCRIPT_COMMAND_IDEA` env property
492+
The `idea` command line launcher can can be created in IntelliJ with `Create Command-line Launcher` command, or you can
493+
set the command used to launch your IntelliJ as `KSCRIPT_COMMAND_IDEA` env property. Similarly, you can set `gradle`
494+
command using `KSCRIPT_COMMAND_GRADLE` env property.
494495

495496
Deploy scripts as standalone binaries
496497
--------------------------------------

src/main/kotlin/io/github/kscripting/kscript/util/Executor.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ class Executor(private val commandResolver: CommandResolver, private val osConfi
6565
osConfig.osType,
6666
command,
6767
envAdjuster = ShellUtils::environmentAdjuster,
68-
waitTimeMinutes = Int.MAX_VALUE
68+
waitTimeMinutes = Int.MAX_VALUE,
69+
inheritInput = true
6970
)
7071

7172
devMsg("Repl execution result:\n$processResult")

0 commit comments

Comments
 (0)