[ fix #29 ] Fix sdk detection

ice1000 · Apr 26, 2019 · a4a6294 · a4a6294
1 parent 5f7740d
commit a4a6294
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/org/ziglang/project/utils.kt b/src/org/ziglang/project/utils.kt
@@ -34,13 +34,15 @@ fun versionOf(path: String) = executeCommand(arrayOf(path, "version"))
 fun findOrCreate(baseDir: VirtualFile, dir: String, module: Module) =
 		baseDir.findChild(dir) ?: baseDir.createChildDirectory(module, dir)
 
-fun validateZigExe(exePath: String) = Files.isExecutable(Paths.get(exePath))
+fun validateZigExe(exePath: String) = Files.exists(Paths.get(exePath))
 
 // https://github.com/zig-lang/zig/blob/7350181a4a778f9d03186e5123beffdf80f58606/src/main.cpp#L140-L173
-fun validateZigLib(libPath: String) = Files.isReadable(Paths.get(libPath, "lib", "zig", "std", "zig.zig"))
+fun validateZigLib(libPath: String) = sequenceOf("zig.zig", "index.zig", "std.zig").any { file ->
+	Files.exists(Paths.get(libPath, "lib", "zig", "std", file))
+}
 
-fun validateZigSDK(sdkHome: String) = Files.isExecutable(Paths.get(sdkHome, "bin", "zig")) ||
-		Files.isExecutable(Paths.get(sdkHome, "bin", "zig.exe"))
+fun validateZigSDK(sdkHome: String) = Files.exists(Paths.get(sdkHome, "bin", "zig")) ||
+		Files.exists(Paths.get(sdkHome, "bin", "zig.exe"))
 
 fun LinkLabel<Any>.asLink() {
 	setListener({ _, _ ->