Merge PR #179 from webwarrior-ws/executable-check-fix

scripts: include *.sh files in executable check.
nblockchain · Nov 6, 2024 · d567244 · d567244
2 parents 897fa58 + a73dfbe
commit d567244
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/scripts/executableConvention.fsx b/scripts/executableConvention.fsx
@@ -9,12 +9,18 @@ open System.IO
 #load "../src/FileConventions/Helpers.fs"
 
 let rootDir = Path.Combine(__SOURCE_DIRECTORY__, "..") |> DirectoryInfo
+let currentDir = Directory.GetCurrentDirectory() |> DirectoryInfo
+
+let targetDir = Helpers.PreferLessDeeplyNestedDir currentDir rootDir
 
 let invalidFiles =
-    Helpers.GetInvalidFiles
-        rootDir
-        "*.fsx"
-        (fun fileInfo -> not(FileConventions.IsExecutable fileInfo))
+    let filter fileInfo =
+        not(FileConventions.IsExecutable fileInfo)
+
+    [ "*.fsx"; "*.sh" ]
+    |> Seq.collect(fun pattern ->
+        Helpers.GetInvalidFiles targetDir pattern filter
+    )
 
 Helpers.AssertNoInvalidFiles
     invalidFiles