Skip to content

Commit 6d5d37d

Browse files
authored
Merge pull request #505 from sourcegraph/olafurpg/test-mvnw-executable
Test that gradlew/mvnw/mill are executable files.
2 parents c5a3151 + df1be33 commit 6d5d37d

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
4040
"gradlew"
4141
)
4242
val gradleCommand: String =
43-
if (Files.isRegularFile(gradleWrapper))
43+
if (
44+
Files.isRegularFile(gradleWrapper) && Files.isExecutable(gradleWrapper)
45+
)
4446
gradleWrapper.toString
4547
else
4648
"gradle"

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class MavenBuildTool(index: IndexCommand) extends BuildTool("Maven", index) {
3030
TemporaryFiles.withDirectory(index) { tmp =>
3131
val mvnw = index.workingDirectory.resolve("mvnw")
3232
val mavenScript =
33-
if (Files.isRegularFile(mvnw))
33+
if (Files.isRegularFile(mvnw) && Files.isExecutable(mvnw))
3434
mvnw.toString
3535
else {
3636
"mvn"

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MillBuildTool.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) {
3838
private val rawOutput = index.output.toString
3939

4040
private def unconditionallyGenerateScip(): Int = {
41-
val localMill = Files.isRegularFile(millFile)
41+
val localMill =
42+
Files.isRegularFile(millFile) && Files.isExecutable(millFile)
4243
val command =
4344
if (localMill) {
4445
"./mill"

0 commit comments

Comments
 (0)