cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-05-20 07:26:58 -04:00
Code Issues Projects Releases Wiki Activity

refactor: upgrade tauri 2.0

Browse Source
This commit is contained in:
Kevin Yue
2024-11-30 21:29:42 +08:00
parent 3316fdf722
commit 877b18b409
16 changed files with 1131 additions and 885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/gpauth/src/cli.rs
View File

@@ -6,7 +6,7 @@ use gpapi::{
clap::args::Os,
gp_params::{ClientOs, GpParams},
process::browser_authenticator::BrowserAuthenticator,
utils::{normalize_server, openssl},
utils::{env_utils, normalize_server, openssl},
GP_USER_AGENT,
};
use log::{info, LevelFilter};
@@ -138,14 +138,7 @@ impl Cli {
}
fn prepare_env(&self) -> anyhow::Result<Option<NamedTempFile>> {
std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
if self.hidpi {
info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
std::env::set_var("GDK_SCALE", "2");
std::env::set_var("GDK_DPI_SCALE", "0.5");
}
env_utils::patch_gui_runtime_env(self.hidpi);
if self.fix_openssl {
info!("Fixing OpenSSL environment");

4
apps/gpclient/src/launch_gui.rs
View File

@@ -4,7 +4,7 @@ use clap::Args;
use directories::ProjectDirs;
use gpapi::{
process::service_launcher::ServiceLauncher,
utils::{endpoint::http_endpoint, env_file, shutdown_signal},
utils::{endpoint::http_endpoint, env_utils, shutdown_signal},
};
use log::info;
use tokio::io::AsyncWriteExt;
@@ -62,7 +62,7 @@ impl<'a> LaunchGuiHandler<'a> {
extra_envs.insert("GP_LOG_FILE".into(), log_file_path.clone());
// Persist the environment variables to a file
let env_file = env_file::persist_env_vars(Some(extra_envs))?;
let env_file = env_utils::persist_env_vars(Some(extra_envs))?;
let env_file = env_file.into_temp_path();
let env_file_path = env_file.to_string_lossy().to_string();

4
apps/gpservice/src/cli.rs
View File

@@ -6,7 +6,7 @@ use clap::Parser;
use gpapi::{
process::gui_launcher::GuiLauncher,
service::{request::WsRequest, vpn_state::VpnState},
utils::{crypto::generate_key, env_file, lock_file::LockFile, redact::Redaction, shutdown_signal},
utils::{crypto::generate_key, env_utils, lock_file::LockFile, redact::Redaction, shutdown_signal},
GP_SERVICE_LOCK_FILE,
};
use log::{info, warn, LevelFilter};
@@ -63,7 +63,7 @@ impl Cli {
if no_gui {
info!("GUI is disabled");
} else {
let envs = self.env_file.as_ref().map(env_file::load_env_vars).transpose()?;
let envs = self.env_file.as_ref().map(env_utils::load_env_vars).transpose()?;
let minimized = self.minimized;