Fix. Install cert silent
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
		
							parent
							
								
									b8f7259fbd
								
							
						
					
					
						commit
						97108e788f
					
				| @ -201,8 +201,15 @@ pub fn core_main() -> Option<Vec<String>> { | |||||||
|                     .ok(); |                     .ok(); | ||||||
|                 return None; |                 return None; | ||||||
|             } else if args[0] == "--install-cert" { |             } else if args[0] == "--install-cert" { | ||||||
|  |                 if args.len() == 1 { | ||||||
|  |                     log::error!("--install-cert must be called with cert file path"); | ||||||
|  |                     return None; | ||||||
|  |                 } | ||||||
|                 #[cfg(windows)] |                 #[cfg(windows)] | ||||||
|                 hbb_common::allow_err!(crate::platform::windows::install_cert(&args[1])); |                 hbb_common::allow_err!(crate::platform::windows::install_cert(&args[1])); | ||||||
|  |                 if args.len() > 2 && args[2] == "silent" { | ||||||
|  |                     return None; | ||||||
|  |                 } | ||||||
|                 #[cfg(all(windows, feature = "virtual_display_driver"))] |                 #[cfg(all(windows, feature = "virtual_display_driver"))] | ||||||
|                 if crate::virtual_display_manager::is_virtual_display_supported() { |                 if crate::virtual_display_manager::is_virtual_display_supported() { | ||||||
|                     hbb_common::allow_err!(crate::virtual_display_manager::install_update_driver()); |                     hbb_common::allow_err!(crate::virtual_display_manager::install_update_driver()); | ||||||
| @ -212,7 +219,15 @@ pub fn core_main() -> Option<Vec<String>> { | |||||||
|                 #[cfg(windows)] |                 #[cfg(windows)] | ||||||
|                 hbb_common::allow_err!(crate::platform::windows::uninstall_cert()); |                 hbb_common::allow_err!(crate::platform::windows::uninstall_cert()); | ||||||
|                 return None; |                 return None; | ||||||
|             } else if args[0] == "--portable-service" { |             } else if args[0] == "--install-update-idd" { | ||||||
|  |                 // --install-cert must be called before this.
 | ||||||
|  |                 #[cfg(all(windows, feature = "virtual_display_driver"))] | ||||||
|  |                 if crate::virtual_display_manager::is_virtual_display_supported() { | ||||||
|  |                     hbb_common::allow_err!(crate::virtual_display_manager::install_update_driver()); | ||||||
|  |                 } | ||||||
|  |                 return None; | ||||||
|  |             } | ||||||
|  |              else if args[0] == "--portable-service" { | ||||||
|                 crate::platform::elevate_or_run_as_system( |                 crate::platform::elevate_or_run_as_system( | ||||||
|                     click_setup, |                     click_setup, | ||||||
|                     _is_elevate, |                     _is_elevate, | ||||||
|  | |||||||
| @ -1029,7 +1029,12 @@ if exist \"{tmp_path}\\{app_name} Tray.lnk\" del /f /q \"{tmp_path}\\{app_name} | |||||||
|     let src_exe = std::env::current_exe()?.to_str().unwrap_or("").to_string(); |     let src_exe = std::env::current_exe()?.to_str().unwrap_or("").to_string(); | ||||||
| 
 | 
 | ||||||
|     let install_cert = if options.contains("driverCert") { |     let install_cert = if options.contains("driverCert") { | ||||||
|         format!("\"{}\" --install-cert \"RustDeskIddDriver.cer\"", src_exe) |         let s = format!(r#""{}" --install-cert "RustDeskIddDriver.cer""#, src_exe); | ||||||
|  |         if silent { | ||||||
|  |             format!("{} silent", s) | ||||||
|  |         } else { | ||||||
|  |             s | ||||||
|  |         } | ||||||
|     } else { |     } else { | ||||||
|         "".to_owned() |         "".to_owned() | ||||||
|     }; |     }; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user