Use -- to pass custom command to run.js

workbenchdev · Oct 18, 2024 · 1b75996 · 1b75996
1 parent 2057f39
commit 1b75996
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,6 +14,12 @@
     "_build/**": true
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[yaml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "rust-analyzer.server.path": "${workspaceFolder}/.flatpak/rust-analyzer.sh",
   "rust-analyzer.runnables.command": "${workspaceFolder}/.flatpak/cargo.sh",
   "rust-analyzer.files.excludeDirs": [
@@ -23,11 +29,5 @@
     "build",
     "builddir"
   ],
-  "[yaml]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
   "vala.languageServerPath": "${workspaceFolder}/.flatpak/vala-language-server.sh"
 }
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ lint:
 
 unit:
 	./build-aux/fun gjs -m ./troll/tst/bin.js test/*.test.js
+#./build-aux/wip/run.js build-aux/re.sonny.Workbench.Devel.json -- gjs -m ./troll/tst/bin.js test/*.test.js
 
 # https://github.com/ximion/appstream/issues/398#issuecomment-1129454985
 # flatpak run org.freedesktop.appstream.cli validate --override=release-time-missing=info --no-net data/app.metainfo.xml
@@ -61,6 +62,7 @@ unit:
 
 test: unit lint
 	./build-aux/fun workbench-cli ci demos/src/Welcome
+#	./build-aux/wip/run.js build-aux/re.sonny.Workbench.Devel.json -- workbench-cli ci demos/src/Welcome/
 
 ci: setup build test
 	./build-aux/fun workbench-cli ci demos/src/*

diff --git a/build-aux/wip/run.js b/build-aux/wip/run.js
@@ -21,10 +21,10 @@ Gio._promisify(
 
 const path = GLib.get_current_dir();
 console.debug(programInvocationName, programArgs);
-const argv = minimist(programArgs, { boolean: true });
+const argv = minimist(programArgs, { boolean: true, "--": true });
 console.debug(argv);
 
-const [manifest_path, ...arg] = argv._;
+const [manifest_path] = argv._;
 if (!manifest_path) {
   // eslint-disable-next-line no-restricted-globals
   print(`${programInvocationName} [--verbose] [--debug] MANIFEST`);
@@ -123,7 +123,7 @@ await buildCommand(["meson", "install", "-C", "_build"]);
 // ]);
 
 // starts workbench
-const command = arg.length ? arg : [manifest.command];
+const command = argv["--"].length ? argv["--"] : [manifest.command];
 await runCommand(command);
 
 function buildCommand(argv) {