Merge pull request #2094 from HitkoDev/fix-windows-glob-issue

Fix Windows glob issue
beautifier · Aug 21, 2022 · b1ccd70 · b1ccd70
2 parents 5d3ef45 + 86cde3e
commit b1ccd70
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PROJECT_ROOT=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+PROJECT_ROOT=$(subst \,/,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
 BUILD_DIR=$(PROJECT_ROOT)build
 SCRIPT_DIR=$(PROJECT_ROOT)tools
 SHELL=/bin/bash

diff --git a/js/src/cli.js b/js/src/cli.js
@@ -63,6 +63,19 @@ nopt.typeDefs.brace_style = {
         return true;
     }
 };
+nopt.typeDefs.glob = {
+    type: "glob",
+    validate: function(data, key, val) {
+        if (typeof val === 'string' && glob.hasMagic(val)) {
+            // Preserve value if it contains glob magic
+            data[key] = val;
+            return true;
+        } else {
+            // Otherwise validate it as regular path
+            return nopt.typeDefs.path.validate(data, key, val);
+        }
+    }
+};
 var path = require('path'),
     editorconfig = require('editorconfig'),
     knownOpts = {
@@ -112,7 +125,7 @@ var path = require('path'),
         // CLI
         "version": Boolean,
         "help": Boolean,
-        "files": [path, Array],
+        "files": ["glob", Array],
         "outfile": path,
         "replace": Boolean,
         "quiet": Boolean,