@takodotid/circuit 1.0.0-rc.1 → 1.0.0-rc.2

package/README.md

@@ -88,9 +88,9 @@ In the editor, `"10g-49"` is an error, `10g-49 is not a port of CE6855-48S6Q-HI`
 
 ## Start
 
-1. Install Circuit:
-    - Linux and macOS: `curl -fsSL https://circuit.tako.id/install | sh`
-    - Windows, in PowerShell: `irm https://circuit.tako.id/install.ps1 | iex`
+1. Install Circuit. Circuit v1 is a release candidate, so its installers come from its GitHub release until circuit.tako.id serves v1:
+    - Linux and macOS: `curl -fsSL https://github.com/takodotid/circuit/releases/download/v1.0.0-rc.2/install | sh`
+    - Windows, in PowerShell: `irm https://github.com/takodotid/circuit/releases/download/v1.0.0-rc.2/install.ps1 | iex`
 2. Start a project: `circuit new network`. Open its folder in VS Code. Add a site in `circuit.ts`, then write each device in `sites/<site>/<device>.ts`.
 3. Run `circuit`. It opens a menu, or runs a command straight away, such as `circuit validate`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@takodotid/circuit",
-    "version": "1.0.0-rc.1",
+    "version": "1.0.0-rc.2",
     "description": "Declarative, vendor-neutral network configuration: describe each device in TypeScript, and Circuit makes the device match. One binary, nothing to install.",
     "homepage": "https://circuit.tako.id",
     "bugs": {

package/src/cli/app.ts

@@ -42,11 +42,15 @@ export class App {
             App.removeFromWindowsPath(folder);
             spawnSync("reg", ["delete", App.UNINSTALL_KEY, "/f"], { stdio: "ignore" });
 
-            // Windows does not let a running program delete itself, so a separate process deletes it once this one has ended.
-            spawn("cmd", ["/c", `ping -n 3 127.0.0.1 >nul & del /f /q "${binary}" & del /f /q "${binary}.old" & rmdir "${folder}"`], {
+            // Windows does not let a running program delete itself, so a separate process deletes it once this one has ended: it tries
+            // again until the file goes, for about ten seconds. Only cmd's own commands: a program it started, such as ping to wait,
+            // would open a console window. The line goes to cmd as written; quoted the usual way, cmd can't read the paths.
+            const remove = `del /f /q "${binary}" "${binary}.old" 2>nul & if not exist "${binary}" (rmdir "${folder}" 2>nul & exit)`;
+            spawn("cmd", ["/d", "/c", `for /l %i in (1,1,10000) do @(${remove})`], {
                 detached: true,
                 stdio: "ignore",
                 windowsHide: true,
+                windowsVerbatimArguments: true,
             }).unref();
         } else {
             rmSync(binary, { force: true });

package/src/cli/index.ts

@@ -27,6 +27,8 @@ class Cli {
         const command = argv[0];
         // The process that keeps remembered secrets, started after a yes to remembering them.
         if (command === SecretsAgent.COMMAND) return SecretsAgent.serve();
+        // This binary's own version and nothing else: no update, no project's version. The installers read it to learn which Circuit is installed.
+        if (command === "--version" || command === "-V") return console.log(VERSION);
         Releases.tidy();
         OnePassword.waiting = (message) => Ui.blocked(message);
 

package/src/cli/releases.ts

@@ -344,7 +344,7 @@ export class Releases {
     static async updateApp(confirmed: boolean): Promise<string | undefined> {
         const binary =
             Releases.binary() ?? Ui.fail("This Circuit runs from its sources. Update it where it came from, such as with git pull.");
-        const target = await Releases.pick(VERSION, confirmed, "Circuit");
+        const target = await Releases.pick(VERSION, confirmed, "The app");
         if (!target) return undefined;
 
         Releases.replace(binary, await Ui.step(`Downloading Circuit ${target}`, () => Releases.fetchBinary(target)));

package/src/cli/version.ts

@@ -1,2 +1,2 @@
 /** This Circuit's version, the same as package.json's. */
-export const VERSION = "1.0.0-rc.1";
+export const VERSION = "1.0.0-rc.2";