From bebfe8e3a1fd9b7bbfeaf605b90171f810a12b60 Mon Sep 17 00:00:00 2001 From: typecad0 Date: Thu, 4 Jul 2024 07:10:02 -0700 Subject: [PATCH] platform code for pcb2gcode --- src-tauri/Cargo.lock | 50 ++++++++++++++++++ src-tauri/Cargo.toml | 2 +- src-tauri/binaries/pcb2gcode.exe | Bin 60928 -> 0 bytes .../.libs/libboost_program_options-mt.dll | Bin .../{ => win32}/.libs/libbrotlicommon.dll | Bin .../{ => win32}/.libs/libbrotlidec.dll | Bin .../binaries/{ => win32}/.libs/libbz2-1.dll | Bin .../binaries/{ => win32}/.libs/libcairo-2.dll | Bin .../{ => win32}/.libs/libdatrie-1.dll | Bin .../binaries/{ => win32}/.libs/libexpat-1.dll | Bin .../binaries/{ => win32}/.libs/libffi-7.dll | Bin .../{ => win32}/.libs/libfontconfig-1.dll | Bin .../{ => win32}/.libs/libfreetype-6.dll | Bin .../{ => win32}/.libs/libfribidi-0.dll | Bin .../{ => win32}/.libs/libgcc_s_seh-1.dll | Bin .../{ => win32}/.libs/libgdk-win32-2.0-0.dll | Bin .../{ => win32}/.libs/libgdk_pixbuf-2.0-0.dll | Bin .../binaries/{ => win32}/.libs/libgeos.dll | Bin .../binaries/{ => win32}/.libs/libgerbv-1.dll | Bin .../{ => win32}/.libs/libgio-2.0-0.dll | Bin .../{ => win32}/.libs/libglib-2.0-0.dll | Bin .../{ => win32}/.libs/libgmodule-2.0-0.dll | Bin .../{ => win32}/.libs/libgobject-2.0-0.dll | Bin .../{ => win32}/.libs/libgraphite2.dll | Bin .../{ => win32}/.libs/libharfbuzz-0.dll | Bin .../binaries/{ => win32}/.libs/libiconv-2.dll | Bin .../binaries/{ => win32}/.libs/libintl-8.dll | Bin .../{ => win32}/.libs/libpango-1.0-0.dll | Bin .../{ => win32}/.libs/libpangocairo-1.0-0.dll | Bin .../{ => win32}/.libs/libpangoft2-1.0-0.dll | Bin .../{ => win32}/.libs/libpangowin32-1.0-0.dll | Bin .../binaries/{ => win32}/.libs/libpcre-1.dll | Bin .../{ => win32}/.libs/libpixman-1-0.dll | Bin .../{ => win32}/.libs/libpng16-16.dll | Bin .../{ => win32}/.libs/libstdc++-6.dll | Bin .../binaries/{ => win32}/.libs/libthai-0.dll | Bin .../{ => win32}/.libs/libwinpthread-1.dll | Bin .../.libs/pcb2gcode.exe} | Bin .../binaries/{ => win32}/.libs/zlib1.dll | Bin src-tauri/tauri.conf.json | 22 ++++---- src/routes/+layout.svelte | 11 ++-- src/routes/+page.svelte | 7 ++- 42 files changed, 76 insertions(+), 16 deletions(-) delete mode 100644 src-tauri/binaries/pcb2gcode.exe rename src-tauri/binaries/{ => win32}/.libs/libboost_program_options-mt.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libbrotlicommon.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libbrotlidec.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libbz2-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libcairo-2.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libdatrie-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libexpat-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libffi-7.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libfontconfig-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libfreetype-6.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libfribidi-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgcc_s_seh-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgdk-win32-2.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgdk_pixbuf-2.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgeos.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgerbv-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgio-2.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libglib-2.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgmodule-2.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgobject-2.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libgraphite2.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libharfbuzz-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libiconv-2.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libintl-8.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpango-1.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpangocairo-1.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpangoft2-1.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpangowin32-1.0-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpcre-1.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpixman-1-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libpng16-16.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libstdc++-6.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libthai-0.dll (100%) rename src-tauri/binaries/{ => win32}/.libs/libwinpthread-1.dll (100%) rename src-tauri/binaries/{.libs/pcb2gcode.exe00 => win32/.libs/pcb2gcode.exe} (100%) rename src-tauri/binaries/{ => win32}/.libs/zlib1.dll (100%) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 70994e2..fa674c4 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1832,6 +1832,17 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + [[package]] name = "os_pipe" version = "1.1.4" @@ -2725,6 +2736,19 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + [[package]] name = "system-deps" version = "5.0.0" @@ -2850,6 +2874,7 @@ dependencies = [ "objc", "once_cell", "open", + "os_info", "os_pipe", "percent-encoding", "rand 0.8.5", @@ -2863,6 +2888,7 @@ dependencies = [ "serialize-to-javascript", "shared_child", "state", + "sys-locale", "tar", "tauri-macros", "tauri-runtime", @@ -3660,6 +3686,15 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -3678,6 +3713,21 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 89fd75b..b0b08e6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.5.2", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.6.5", features = [ "path-all", "shell-all", "fs-all", "dialog-all"] } +tauri = { version = "1.6.5", features = [ "os-all", "path-all", "shell-all", "fs-all", "dialog-all"] } [features] # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled. diff --git a/src-tauri/binaries/pcb2gcode.exe b/src-tauri/binaries/pcb2gcode.exe deleted file mode 100644 index 0b8ed9efac25b9311b1d7fda06cabd6ecd8fb9d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60928 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 diff --git a/src-tauri/binaries/.libs/libboost_program_options-mt.dll b/src-tauri/binaries/win32/.libs/libboost_program_options-mt.dll similarity index 100% rename from src-tauri/binaries/.libs/libboost_program_options-mt.dll rename to src-tauri/binaries/win32/.libs/libboost_program_options-mt.dll diff --git a/src-tauri/binaries/.libs/libbrotlicommon.dll b/src-tauri/binaries/win32/.libs/libbrotlicommon.dll similarity index 100% rename from src-tauri/binaries/.libs/libbrotlicommon.dll rename to src-tauri/binaries/win32/.libs/libbrotlicommon.dll diff --git a/src-tauri/binaries/.libs/libbrotlidec.dll b/src-tauri/binaries/win32/.libs/libbrotlidec.dll similarity index 100% rename from src-tauri/binaries/.libs/libbrotlidec.dll rename to src-tauri/binaries/win32/.libs/libbrotlidec.dll diff --git a/src-tauri/binaries/.libs/libbz2-1.dll b/src-tauri/binaries/win32/.libs/libbz2-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libbz2-1.dll rename to src-tauri/binaries/win32/.libs/libbz2-1.dll diff --git a/src-tauri/binaries/.libs/libcairo-2.dll b/src-tauri/binaries/win32/.libs/libcairo-2.dll similarity index 100% rename from src-tauri/binaries/.libs/libcairo-2.dll rename to src-tauri/binaries/win32/.libs/libcairo-2.dll diff --git a/src-tauri/binaries/.libs/libdatrie-1.dll b/src-tauri/binaries/win32/.libs/libdatrie-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libdatrie-1.dll rename to src-tauri/binaries/win32/.libs/libdatrie-1.dll diff --git a/src-tauri/binaries/.libs/libexpat-1.dll b/src-tauri/binaries/win32/.libs/libexpat-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libexpat-1.dll rename to src-tauri/binaries/win32/.libs/libexpat-1.dll diff --git a/src-tauri/binaries/.libs/libffi-7.dll b/src-tauri/binaries/win32/.libs/libffi-7.dll similarity index 100% rename from src-tauri/binaries/.libs/libffi-7.dll rename to src-tauri/binaries/win32/.libs/libffi-7.dll diff --git a/src-tauri/binaries/.libs/libfontconfig-1.dll b/src-tauri/binaries/win32/.libs/libfontconfig-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libfontconfig-1.dll rename to src-tauri/binaries/win32/.libs/libfontconfig-1.dll diff --git a/src-tauri/binaries/.libs/libfreetype-6.dll b/src-tauri/binaries/win32/.libs/libfreetype-6.dll similarity index 100% rename from src-tauri/binaries/.libs/libfreetype-6.dll rename to src-tauri/binaries/win32/.libs/libfreetype-6.dll diff --git a/src-tauri/binaries/.libs/libfribidi-0.dll b/src-tauri/binaries/win32/.libs/libfribidi-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libfribidi-0.dll rename to src-tauri/binaries/win32/.libs/libfribidi-0.dll diff --git a/src-tauri/binaries/.libs/libgcc_s_seh-1.dll b/src-tauri/binaries/win32/.libs/libgcc_s_seh-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libgcc_s_seh-1.dll rename to src-tauri/binaries/win32/.libs/libgcc_s_seh-1.dll diff --git a/src-tauri/binaries/.libs/libgdk-win32-2.0-0.dll b/src-tauri/binaries/win32/.libs/libgdk-win32-2.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libgdk-win32-2.0-0.dll rename to src-tauri/binaries/win32/.libs/libgdk-win32-2.0-0.dll diff --git a/src-tauri/binaries/.libs/libgdk_pixbuf-2.0-0.dll b/src-tauri/binaries/win32/.libs/libgdk_pixbuf-2.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libgdk_pixbuf-2.0-0.dll rename to src-tauri/binaries/win32/.libs/libgdk_pixbuf-2.0-0.dll diff --git a/src-tauri/binaries/.libs/libgeos.dll b/src-tauri/binaries/win32/.libs/libgeos.dll similarity index 100% rename from src-tauri/binaries/.libs/libgeos.dll rename to src-tauri/binaries/win32/.libs/libgeos.dll diff --git a/src-tauri/binaries/.libs/libgerbv-1.dll b/src-tauri/binaries/win32/.libs/libgerbv-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libgerbv-1.dll rename to src-tauri/binaries/win32/.libs/libgerbv-1.dll diff --git a/src-tauri/binaries/.libs/libgio-2.0-0.dll b/src-tauri/binaries/win32/.libs/libgio-2.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libgio-2.0-0.dll rename to src-tauri/binaries/win32/.libs/libgio-2.0-0.dll diff --git a/src-tauri/binaries/.libs/libglib-2.0-0.dll b/src-tauri/binaries/win32/.libs/libglib-2.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libglib-2.0-0.dll rename to src-tauri/binaries/win32/.libs/libglib-2.0-0.dll diff --git a/src-tauri/binaries/.libs/libgmodule-2.0-0.dll b/src-tauri/binaries/win32/.libs/libgmodule-2.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libgmodule-2.0-0.dll rename to src-tauri/binaries/win32/.libs/libgmodule-2.0-0.dll diff --git a/src-tauri/binaries/.libs/libgobject-2.0-0.dll b/src-tauri/binaries/win32/.libs/libgobject-2.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libgobject-2.0-0.dll rename to src-tauri/binaries/win32/.libs/libgobject-2.0-0.dll diff --git a/src-tauri/binaries/.libs/libgraphite2.dll b/src-tauri/binaries/win32/.libs/libgraphite2.dll similarity index 100% rename from src-tauri/binaries/.libs/libgraphite2.dll rename to src-tauri/binaries/win32/.libs/libgraphite2.dll diff --git a/src-tauri/binaries/.libs/libharfbuzz-0.dll b/src-tauri/binaries/win32/.libs/libharfbuzz-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libharfbuzz-0.dll rename to src-tauri/binaries/win32/.libs/libharfbuzz-0.dll diff --git a/src-tauri/binaries/.libs/libiconv-2.dll b/src-tauri/binaries/win32/.libs/libiconv-2.dll similarity index 100% rename from src-tauri/binaries/.libs/libiconv-2.dll rename to src-tauri/binaries/win32/.libs/libiconv-2.dll diff --git a/src-tauri/binaries/.libs/libintl-8.dll b/src-tauri/binaries/win32/.libs/libintl-8.dll similarity index 100% rename from src-tauri/binaries/.libs/libintl-8.dll rename to src-tauri/binaries/win32/.libs/libintl-8.dll diff --git a/src-tauri/binaries/.libs/libpango-1.0-0.dll b/src-tauri/binaries/win32/.libs/libpango-1.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libpango-1.0-0.dll rename to src-tauri/binaries/win32/.libs/libpango-1.0-0.dll diff --git a/src-tauri/binaries/.libs/libpangocairo-1.0-0.dll b/src-tauri/binaries/win32/.libs/libpangocairo-1.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libpangocairo-1.0-0.dll rename to src-tauri/binaries/win32/.libs/libpangocairo-1.0-0.dll diff --git a/src-tauri/binaries/.libs/libpangoft2-1.0-0.dll b/src-tauri/binaries/win32/.libs/libpangoft2-1.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libpangoft2-1.0-0.dll rename to src-tauri/binaries/win32/.libs/libpangoft2-1.0-0.dll diff --git a/src-tauri/binaries/.libs/libpangowin32-1.0-0.dll b/src-tauri/binaries/win32/.libs/libpangowin32-1.0-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libpangowin32-1.0-0.dll rename to src-tauri/binaries/win32/.libs/libpangowin32-1.0-0.dll diff --git a/src-tauri/binaries/.libs/libpcre-1.dll b/src-tauri/binaries/win32/.libs/libpcre-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libpcre-1.dll rename to src-tauri/binaries/win32/.libs/libpcre-1.dll diff --git a/src-tauri/binaries/.libs/libpixman-1-0.dll b/src-tauri/binaries/win32/.libs/libpixman-1-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libpixman-1-0.dll rename to src-tauri/binaries/win32/.libs/libpixman-1-0.dll diff --git a/src-tauri/binaries/.libs/libpng16-16.dll b/src-tauri/binaries/win32/.libs/libpng16-16.dll similarity index 100% rename from src-tauri/binaries/.libs/libpng16-16.dll rename to src-tauri/binaries/win32/.libs/libpng16-16.dll diff --git a/src-tauri/binaries/.libs/libstdc++-6.dll b/src-tauri/binaries/win32/.libs/libstdc++-6.dll similarity index 100% rename from src-tauri/binaries/.libs/libstdc++-6.dll rename to src-tauri/binaries/win32/.libs/libstdc++-6.dll diff --git a/src-tauri/binaries/.libs/libthai-0.dll b/src-tauri/binaries/win32/.libs/libthai-0.dll similarity index 100% rename from src-tauri/binaries/.libs/libthai-0.dll rename to src-tauri/binaries/win32/.libs/libthai-0.dll diff --git a/src-tauri/binaries/.libs/libwinpthread-1.dll b/src-tauri/binaries/win32/.libs/libwinpthread-1.dll similarity index 100% rename from src-tauri/binaries/.libs/libwinpthread-1.dll rename to src-tauri/binaries/win32/.libs/libwinpthread-1.dll diff --git a/src-tauri/binaries/.libs/pcb2gcode.exe00 b/src-tauri/binaries/win32/.libs/pcb2gcode.exe similarity index 100% rename from src-tauri/binaries/.libs/pcb2gcode.exe00 rename to src-tauri/binaries/win32/.libs/pcb2gcode.exe diff --git a/src-tauri/binaries/.libs/zlib1.dll b/src-tauri/binaries/win32/.libs/zlib1.dll similarity index 100% rename from src-tauri/binaries/.libs/zlib1.dll rename to src-tauri/binaries/win32/.libs/zlib1.dll diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 39a3139..238ed1b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,8 +7,8 @@ "distDir": "../build" }, "package": { - "productName": "pcb2cnc", - "version": "0.1.0" + "productName": "KiCNC", + "version": "0.9.0" }, "tauri": { "allowlist": { @@ -19,8 +19,8 @@ "open": true, "scope": [ { - "name": "pcb2gcode", - "cmd": "$RESOURCE/.libs/pcb2gcode.exe", + "name": "pcb2gcode-win32", + "cmd": "$RESOURCE/binaries/win32/.libs/pcb2gcode.exe", "args": true } ] @@ -46,9 +46,12 @@ "exists": true, "scope": ["**", "$RESOURCE/*"] }, - "path": { - "all": true - } + "path": { + "all": true + }, + "os": { + "all": true + } }, "bundle": { "active": true, @@ -74,10 +77,7 @@ "providerShortName": null, "signingIdentity": null }, - "resources": [ - "binaries/pcb2gcode.exe", - "binaries/.libs/*" - ], + "resources": ["binaries/*"], "shortDescription": "", "targets": "all", "windows": { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 7b65501..adc40a1 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -7,6 +7,8 @@ import { Command } from '@tauri-apps/api/shell'; import { CircuitBoard } from 'lucide-svelte'; import { ModeWatcher } from 'mode-watcher'; + import { platform } from '@tauri-apps/api/os'; + import '../app.css'; const sidebarNavItems = [ @@ -208,21 +210,24 @@ _stdout = ''; _stderr = ''; - const command = new Command('pcb2gcode', _command_arguments, { cwd: $project_dir }); + const platform_name = await platform(); + const pcb2gcode_arch = `pcb2gcode-${platform_name}` + + const command = new Command(pcb2gcode_arch, _command_arguments, { cwd: $project_dir }); command.on('error', (error) => console.error(`command error: "${error}"`)); command.stdout.on('data', (line) => (_stdout += line + '
')); command.stderr.on('data', (line) => (_stderr += line + '
')); await command.execute(); _stdout += 'Making stencil' + '
'; - const stencil_command = new Command('pcb2gcode', _stencil_arguments, { cwd: $project_dir }); + const stencil_command = new Command(pcb2gcode_arch, _stencil_arguments, { cwd: $project_dir }); stencil_command.on('error', (error) => console.error(`command error: "${error}"`)); stencil_command.stdout.on('data', (line) => (_stdout += line + '
')); stencil_command.stderr.on('data', (line) => (_stderr += line + '
')); await stencil_command.execute(); _stdout += 'Making mask' + '
'; - const mask_command = new Command('pcb2gcode', _mask_arguments, { cwd: $project_dir }); + const mask_command = new Command(pcb2gcode_arch, _mask_arguments, { cwd: $project_dir }); mask_command.on('error', (error) => console.error(`command error: "${error}"`)); mask_command.stdout.on('data', (line) => (_stdout += line + '
')); mask_command.stderr.on('data', (line) => (_stderr += line + '
')); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e408d7e..f53523c 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -131,4 +131,9 @@ rel="noopener noreferrer">https://github.com/u-fire/kicnc

Version: 0.9.0

- +Microfire LLC \ No newline at end of file