mirror of
https://github.com/Grasscutters/Cultivation.git
synced 2025-12-13 15:44:35 +01:00
fix: remove duct
This commit is contained in:
37
src-tauri/Cargo.lock
generated
37
src-tauri/Cargo.lock
generated
@@ -793,7 +793,6 @@ dependencies = [
|
|||||||
"args",
|
"args",
|
||||||
"cc",
|
"cc",
|
||||||
"ctrlc",
|
"ctrlc",
|
||||||
"duct",
|
|
||||||
"file_diff",
|
"file_diff",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"getopts",
|
"getopts",
|
||||||
@@ -1016,18 +1015,6 @@ dependencies = [
|
|||||||
"dtoa",
|
"dtoa",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "duct"
|
|
||||||
version = "0.13.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0fc6a0a59ed0888e0041cf708e66357b7ae1a82f1c67247e1f93b5e0818f7d8d"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"once_cell",
|
|
||||||
"os_pipe 0.9.2",
|
|
||||||
"shared_child 0.3.5",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.7.0"
|
version = "1.7.0"
|
||||||
@@ -2624,16 +2611,6 @@ dependencies = [
|
|||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "os_pipe"
|
|
||||||
version = "0.9.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "os_pipe"
|
name = "os_pipe"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@@ -3779,16 +3756,6 @@ dependencies = [
|
|||||||
"lazy_static",
|
"lazy_static",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "shared_child"
|
|
||||||
version = "0.3.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6be9f7d5565b1483af3e72975e2dee33879b3b86bd48c0929fccf6585d79e65a"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "shared_child"
|
name = "shared_child"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@@ -4121,7 +4088,7 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"open",
|
"open",
|
||||||
"os_info",
|
"os_info",
|
||||||
"os_pipe 1.0.1",
|
"os_pipe",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@@ -4132,7 +4099,7 @@ dependencies = [
|
|||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_repr",
|
"serde_repr",
|
||||||
"serialize-to-javascript",
|
"serialize-to-javascript",
|
||||||
"shared_child 1.0.0",
|
"shared_child",
|
||||||
"state",
|
"state",
|
||||||
"tar",
|
"tar",
|
||||||
"tauri-macros",
|
"tauri-macros",
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ once_cell = "1.13.0"
|
|||||||
|
|
||||||
# Program opener.
|
# Program opener.
|
||||||
open = "3.0.2"
|
open = "3.0.2"
|
||||||
duct = "0.13.5"
|
|
||||||
|
|
||||||
# Services
|
# Services
|
||||||
windows-service = "0.6.0"
|
windows-service = "0.6.0"
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ fn main() -> Result<(), ArgsError> {
|
|||||||
println!("You running as a non-elevated user. Some stuff will almost definitely not work.");
|
println!("You running as a non-elevated user. Some stuff will almost definitely not work.");
|
||||||
println!("===============================================================================");
|
println!("===============================================================================");
|
||||||
|
|
||||||
reopen_as_admin();
|
//reopen_as_admin();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup datadir/cultivation just in case something went funky and it wasn't made
|
// Setup datadir/cultivation just in case something went funky and it wasn't made
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use duct::cmd;
|
|
||||||
use ini::Ini;
|
use ini::Ini;
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
use {
|
use {
|
||||||
@@ -60,7 +60,10 @@ pub fn run_command(program: &str, args: Vec<&str>, relative: Option<bool>) {
|
|||||||
std::env::set_current_dir(&path_buf).unwrap();
|
std::env::set_current_dir(&path_buf).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd(prog, args).run().unwrap();
|
// Run the command
|
||||||
|
let mut command = Command::new(&prog);
|
||||||
|
command.args(&args);
|
||||||
|
command.spawn().unwrap();
|
||||||
|
|
||||||
// Restore the original working directory
|
// Restore the original working directory
|
||||||
std::env::set_current_dir(cwd).unwrap();
|
std::env::set_current_dir(cwd).unwrap();
|
||||||
|
|||||||
Reference in New Issue
Block a user