mirror of
https://github.com/ow-mods/ow-mod-man.git
synced 2025-12-11 20:15:50 +01:00
[GUI] Make disable updater script
This commit is contained in:
Ben C
parent
5d6b8d7cb3
commit
20067a93c2
75
Cargo.lock
generated
75
Cargo.lock
generated
@ -424,7 +424,7 @@ dependencies = [
|
||||
"num-traits",
|
||||
"serde",
|
||||
"wasm-bindgen",
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2104,7 +2104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2702,7 +2702,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
|
||||
|
||||
[[package]]
|
||||
name = "owmods_cli"
|
||||
version = "0.14.1"
|
||||
version = "0.14.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@ -2808,7 +2808,7 @@ dependencies = [
|
||||
"libc",
|
||||
"redox_syscall 0.5.2",
|
||||
"smallvec",
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3712,9 +3712,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_with"
|
||||
version = "3.8.2"
|
||||
version = "3.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "079f3a42cd87588d924ed95b533f8d30a483388c4e400ab736a7058e34f16169"
|
||||
checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"chrono",
|
||||
@ -3730,9 +3730,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_with_macros"
|
||||
version = "3.8.2"
|
||||
version = "3.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc03aad67c1d26b7de277d51c86892e7d9a0110a2fe44bf6b26cc569fba302d6"
|
||||
checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"proc-macro2",
|
||||
@ -5249,7 +5249,7 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -5307,7 +5307,7 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -5342,18 +5342,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.52.5",
|
||||
"windows_aarch64_msvc 0.52.5",
|
||||
"windows_i686_gnu 0.52.5",
|
||||
"windows_aarch64_gnullvm 0.52.6",
|
||||
"windows_aarch64_msvc 0.52.6",
|
||||
"windows_i686_gnu 0.52.6",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc 0.52.5",
|
||||
"windows_x86_64_gnu 0.52.5",
|
||||
"windows_x86_64_gnullvm 0.52.5",
|
||||
"windows_x86_64_msvc 0.52.5",
|
||||
"windows_i686_msvc 0.52.6",
|
||||
"windows_x86_64_gnu 0.52.6",
|
||||
"windows_x86_64_gnullvm 0.52.6",
|
||||
"windows_x86_64_msvc 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -5368,7 +5368,7 @@ version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -5385,9 +5385,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
@ -5415,9 +5415,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
@ -5445,15 +5445,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
@ -5481,9 +5481,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
@ -5511,9 +5511,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
@ -5529,9 +5529,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
@ -5559,9 +5559,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
@ -5717,6 +5717,9 @@ dependencies = [
|
||||
"clap_complete",
|
||||
"clap_mangen",
|
||||
"regex",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"toml_edit 0.22.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@ -8,8 +8,8 @@ pkgs.mkShell {
|
||||
clippy
|
||||
rustfmt
|
||||
nodejs
|
||||
openssl
|
||||
gcc
|
||||
openssl
|
||||
webkitgtk
|
||||
glib-networking
|
||||
pkg-config
|
||||
|
||||
@ -8,9 +8,6 @@ readme = "./README.md"
|
||||
repository = "https://github.com/ow-mods/ow-mod-man/"
|
||||
license = "GPL-3.0-or-later"
|
||||
|
||||
[package.metadata.deb]
|
||||
depends = "libssl1.1"
|
||||
|
||||
[dependencies]
|
||||
owmods_core = { version = "0.14.1", path = "../owmods_core" }
|
||||
clap = { version = "4.5.4", features = ["derive"] }
|
||||
|
||||
@ -15,8 +15,7 @@ tauri-build = { version = "1.5.3", features = [] }
|
||||
owmods_core = { version = "0.14.1", path = "../../owmods_core" }
|
||||
serde_json = "1.0.120"
|
||||
serde = { version = "1.0.200", features = ["derive"] }
|
||||
tauri = { version = "1.7.1", features = [ "process-exit", "clipboard-write-text",
|
||||
"app-all",
|
||||
tauri = { version = "1.7.1", features = [ "app-all", "process-exit", "clipboard-write-text",
|
||||
"dialog-ask",
|
||||
"dialog-confirm",
|
||||
"dialog-message",
|
||||
@ -27,7 +26,6 @@ tauri = { version = "1.7.1", features = [ "process-exit", "clipboard-write-text"
|
||||
"updater",
|
||||
"window-set-focus",
|
||||
"window-set-title",
|
||||
# "reqwest-native-tls-vendored"
|
||||
] }
|
||||
anyhow = "1.0.82"
|
||||
tokio = { version = "1.37.0", features = ["sync", "macros"] }
|
||||
@ -37,7 +35,7 @@ notify = { version = "6.1.1", default-features = false, features = [
|
||||
"macos_kqueue",
|
||||
] }
|
||||
regex = "1.10.4"
|
||||
time = { version = "0.3.36", features = ["macros", "local-offset"] }
|
||||
time = { version = "0.3.36", features = ["macros", "local-offset", "formatting", "parsing"] }
|
||||
tauri-plugin-deep-link = "0.1.2"
|
||||
opener = "0.7.0"
|
||||
tauri-plugin-window-state = "0.1.1"
|
||||
|
||||
@ -11,7 +11,7 @@ use owmods_core::progress::ProgressPayload;
|
||||
use serde::Serialize;
|
||||
use std::fs::create_dir_all;
|
||||
use tauri::{async_runtime, AppHandle, Manager};
|
||||
use time::macros::format_description;
|
||||
use crate::format_description;
|
||||
use time::OffsetDateTime;
|
||||
use typeshare::typeshare;
|
||||
|
||||
|
||||
@ -10,21 +10,21 @@
|
||||
},
|
||||
"tauri": {
|
||||
"allowlist": {
|
||||
"dialog": {
|
||||
"confirm": true,
|
||||
"open": true,
|
||||
"message": true,
|
||||
"save": true,
|
||||
"ask": true
|
||||
},
|
||||
"clipboard": {
|
||||
"writeText": true
|
||||
},
|
||||
"app": {
|
||||
"all": true,
|
||||
"hide": false,
|
||||
"show": false
|
||||
},
|
||||
"clipboard": {
|
||||
"writeText": true
|
||||
},
|
||||
"dialog": {
|
||||
"ask": true,
|
||||
"confirm": true,
|
||||
"message": true,
|
||||
"open": true,
|
||||
"save": true
|
||||
},
|
||||
"os": {
|
||||
"all": true
|
||||
},
|
||||
@ -35,17 +35,14 @@
|
||||
"open": "(^https://(www\\.)?(github.com|outerwildsmods.com|paypal.me|patreon.com|buymeacoffee.com|cash.app|ko-fi.com)/)|(^https://(www\\.)?discord.gg/wusTQYbYTc$)"
|
||||
},
|
||||
"window": {
|
||||
"setTitle": true,
|
||||
"setFocus": true
|
||||
"setFocus": true,
|
||||
"setTitle": true
|
||||
}
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"category": "Game",
|
||||
"copyright": "",
|
||||
"deb": {
|
||||
"depends": ["libssl1.1"]
|
||||
},
|
||||
"externalBin": [],
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
@ -69,47 +66,50 @@
|
||||
"windows": {
|
||||
"certificateThumbprint": null,
|
||||
"digestAlgorithm": "sha256",
|
||||
"nsis": {
|
||||
"headerImage": "installer-images/nsis/Header.bmp",
|
||||
"installMode": "both",
|
||||
"installerIcon": "icons/icon.ico",
|
||||
"license": "../../LICENSE",
|
||||
"sidebarImage": "installer-images/nsis/Sidebar.bmp"
|
||||
},
|
||||
"timestampUrl": "",
|
||||
"wix": {
|
||||
"license": "../../LICENSE",
|
||||
"bannerPath": "installer-images/wix/TopBanner.png",
|
||||
"dialogImagePath": "installer-images/wix/Background.png"
|
||||
},
|
||||
"nsis": {
|
||||
"license": "../../LICENSE",
|
||||
"installerIcon": "icons/icon.ico",
|
||||
"installMode": "both",
|
||||
"headerImage": "installer-images/nsis/Header.bmp",
|
||||
"sidebarImage": "installer-images/nsis/Sidebar.bmp"
|
||||
"dialogImagePath": "installer-images/wix/Background.png",
|
||||
"license": "../../LICENSE"
|
||||
}
|
||||
}
|
||||
},
|
||||
"security": {
|
||||
"csp": "default-src 'self'; img-src 'self' https://ow-mods.github.io; style-src 'self' 'unsafe-inline'; font-src 'self' data:",
|
||||
"dangerousDisableAssetCspModification": ["style-src", "font-src"]
|
||||
"dangerousDisableAssetCspModification": [
|
||||
"style-src",
|
||||
"font-src"
|
||||
]
|
||||
},
|
||||
"updater": {
|
||||
"active": true,
|
||||
"dialog": true,
|
||||
"windows": {
|
||||
"installMode": "basicUi"
|
||||
},
|
||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDkzRURBNzdENEVCREU1NDYKUldSRzViMU9mYWZ0azRoODZIdmVGWUZxVTNQRUVXU2hOTllqcGM4N2RRNjFEN2N3cnhXbW45V0sK",
|
||||
"endpoints": [
|
||||
"https://github.com/Bwc9876/ow-mod-man/releases/latest/download/latest.json",
|
||||
"https://github.com/ow-mods/ow-mod-man/releases/latest/download/latest.json"
|
||||
]
|
||||
],
|
||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDkzRURBNzdENEVCREU1NDYKUldSRzViMU9mYWZ0azRoODZIdmVGWUZxVTNQRUVXU2hOTllqcGM4N2RRNjFEN2N3cnhXbW45V0sK",
|
||||
"windows": {
|
||||
"installMode": "basicUi"
|
||||
}
|
||||
},
|
||||
"windows": [
|
||||
{
|
||||
"fullscreen": false,
|
||||
"height": 750,
|
||||
"minHeight": 400,
|
||||
"minWidth": 600,
|
||||
"resizable": true,
|
||||
"title": "Outer Wilds Mod Manager",
|
||||
"width": 850,
|
||||
"minWidth": 600
|
||||
"width": 850
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -9,3 +9,6 @@ clap = { version = "4.2.2", features = ["derive", "string"] }
|
||||
clap_complete = "4.2.0"
|
||||
clap_mangen = "0.2.10"
|
||||
regex = "1.7.3"
|
||||
serde = "1.0.203"
|
||||
serde_json = "1.0.120"
|
||||
toml_edit = "0.22.14"
|
||||
|
||||
36
xtask/src/gui_disable_updater.rs
Normal file
36
xtask/src/gui_disable_updater.rs
Normal file
@ -0,0 +1,36 @@
|
||||
|
||||
use std::process::Command;
|
||||
|
||||
use anyhow::Result;
|
||||
use serde_json::{Value, from_str};
|
||||
use toml_edit::{Document, value};
|
||||
|
||||
const GUI_TAURI_CONF_PATH: &str = "owmods_gui/backend/tauri.conf.json";
|
||||
const GUI_CARGO_TOML_PATH: &str = "owmods_gui/backend/Cargo.toml";
|
||||
|
||||
pub fn disable_updater() -> Result<()> {
|
||||
println!("Disabling updater...");
|
||||
// tauri.conf.json
|
||||
let tauri_conf = std::fs::read_to_string(GUI_TAURI_CONF_PATH)?;
|
||||
let mut tauri_conf: Value = from_str(&tauri_conf)?;
|
||||
tauri_conf["tauri"]["updater"]["active"] = false.into();
|
||||
// Cargo.toml
|
||||
let cargo_toml = std::fs::read_to_string(GUI_CARGO_TOML_PATH)?;
|
||||
let mut cargo_toml = cargo_toml.parse::<Document>()?;
|
||||
let mut features = cargo_toml["dependencies"]["tauri"]["features"].as_array_mut().unwrap();
|
||||
features.retain(|f| f.as_str().unwrap() != "updater");
|
||||
// Write to files
|
||||
std::fs::write(GUI_TAURI_CONF_PATH, serde_json::to_string_pretty(&tauri_conf)?)?;
|
||||
std::fs::write(GUI_CARGO_TOML_PATH, cargo_toml.to_string())?;
|
||||
|
||||
println!("Refetching dependencies...");
|
||||
|
||||
let cmd = Command::new("cargo")
|
||||
.arg("update")
|
||||
.current_dir("owmods_gui/backend")
|
||||
.output()?;
|
||||
|
||||
println!("Updater disabled.");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@ -3,13 +3,16 @@ use std::path::PathBuf;
|
||||
use anyhow::Result;
|
||||
use cli_tasks::{generate_cli_pkg_build, generate_completions, generate_man_files, print_version};
|
||||
use gui_tasks::generate_gui_pkg_build;
|
||||
use gui_disable_updater::disable_updater;
|
||||
use regex::RegexBuilder;
|
||||
|
||||
mod cli_tasks;
|
||||
mod gui_tasks;
|
||||
mod gui_disable_updater;
|
||||
mod log_client;
|
||||
mod log_spammer;
|
||||
|
||||
|
||||
pub fn get_out_dir() -> Result<PathBuf> {
|
||||
let out_dir = std::path::PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap())
|
||||
.parent()
|
||||
@ -41,6 +44,7 @@ fn main() -> Result<()> {
|
||||
}
|
||||
"cli_pkg_build" => generate_cli_pkg_build()?,
|
||||
"gui_pkg_build" => generate_gui_pkg_build()?,
|
||||
"gui_disable_updater" => disable_updater()?,
|
||||
"cli_version" => print_version()?,
|
||||
"log_client" => log_client::log_client()?,
|
||||
"spam_logs" => log_spammer::spam_logs(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user