Skip to content

Commit 133490f

Browse files
committed
Add globbing support to Merge.fromMergeTemplate()
Fixes #8
1 parent 8a2fdd4 commit 133490f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/kotlin/myaa/subkt/tasks/asstasks.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ open class Merge : ASSTask() {
242242
syncTargetTime(line.start)
243243
}
244244
}
245-
val merged = template.resolveSibling(line.text)
245+
val merged = (template.parent + "/" + line.text).replace('\\', '/')
246246

247-
FileSpecPair(merged, spec)
247+
FileSpecPair(project.globPath(merged), spec)
248248
} else {
249249
null
250250
}

0 commit comments

Comments
 (0)