Skip to content

Commit 6abc204

Browse files
committed
Merge branch 'pull/219'
2 parents 228ce7c + baba138 commit 6abc204

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

src/main/kotlin/kscript/app/Kscript.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ fun prepareScript(scriptResource: String): Pair<File, URI> {
333333
// if we can "just" read from script resource create tmp file
334334
// i.e. script input is process substitution file handle
335335
// not FileInputStream(this).bufferedReader().use{ readText()} does not work nor does this.readText
336+
includeContext = this.absoluteFile.parentFile.toURI()
336337
createTmpScript(FileInputStream(this).bufferedReader().readText())
337338
}
338339
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env kscript
2+
3+
//INCLUDE rel_includes/include_1.kt
4+
include_1()

test/test_suite.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,9 @@ export -f kscript_nocall
267267
## temp projects with include symlinks
268268
assert_raises 'tmpDir=$(kscript_nocall --idea test/resources/includes/include_variations.kts | cut -f2 -d" " | xargs echo); cd $tmpDir && gradle build' 0
269269

270+
## Ensure relative includes with in shebang mode
271+
assert_raises resources/includes/shebang_mode_includes 0
272+
270273
## support diamond-shaped include schemes (see #133)
271274
assert_raises 'tmpDir=$(kscript_nocall --idea test/resources/includes/diamond.kts | cut -f2 -d" " | xargs echo); cd $tmpDir && gradle build' 0
272275

0 commit comments

Comments
 (0)