admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore openssl-probe (#490)

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-07-30 10:18:37 +03:00
committed by GitHub
parent 98a99284b3
commit d2bab85a86
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -1836,6 +1836,7 @@ dependencies = [
"log", "log",
"nix", "nix",
"notify-rust", "notify-rust",
"openssl-probe",
"pretty_env_logger", "pretty_env_logger",
"rust-ini", "rust-ini",
"self_update", "self_update",

3
Cargo.toml
View File

@@ -45,6 +45,7 @@ self_update_crate = { version = "0.16.0", optional = true, package = "self_upda
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
rust-ini = "0.15.0" rust-ini = "0.15.0"
openssl-probe = { version = "0.1.2", optional = true }
[profile.release] [profile.release]
lto = true lto = true
@@ -52,4 +53,4 @@ lto = true
[features] [features]
default = [] default = []
self-update = ["self_update_crate"] self-update = ["self_update_crate", "openssl-probe"]

4
src/main.rs
View File

@@ -23,6 +23,7 @@ use self::steps::*;
use self::terminal::*; use self::terminal::*;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use log::debug; use log::debug;
use std::env; use std::env;
use std::io; use std::io;
use std::process::exit; use std::process::exit;
@@ -74,6 +75,9 @@ fn run() -> Result<()> {
#[cfg(feature = "self-update")] #[cfg(feature = "self-update")]
{ {
#[cfg(target_os = "linux")]
openssl_probe::init_ssl_cert_env_vars();
if !run_type.dry() && env::var("TOPGRADE_NO_SELF_UPGRADE").is_err() { if !run_type.dry() && env::var("TOPGRADE_NO_SELF_UPGRADE").is_err() {
let result = self_update::self_update(); let result = self_update::self_update();