Skip to content

fix(cli): gate Linux-only self-update symbols behind cfg(unix) #2572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
1688mengdie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): gate Linux-only self-update symbols behind cfg(unix) #2572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/apps/cli/src/self_update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
use anyhow::{anyhow, Context, Result};
#[cfg(unix)]
use flate2::read::GzDecoder;
use futures_util::StreamExt;
use reqwest::Client;
use serde::Deserialize;
use sha2::{Digest, Sha256};
use std::fs;
#[cfg(unix)]
use std::io::Cursor;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use std::time::{Duration, Instant, SystemTime};
#[cfg(unix)]
use tar::Archive;

const GITHUB_MANIFEST: &str =
"https://github.com/GCWing/BitFun/releases/latest/download/linux-binaries.json";
const OPENBITFUN_MANIFEST: &str = "https://openbitfun.com/release/linux-binaries.json";
const AUTO_CHECK_INTERVAL: Duration = Duration::from_secs(6 * 60 * 60);
#[cfg(unix)]
const DEPRECATION_WARNING: &str = "Warning: `bitfun-cli` is deprecated; use `bitfun` instead.";

/// Source-selection tuning. Mirrors the relay deploy path in
Expand Down Expand Up @@ -1163,6 +1167,7 @@ fn install_archive(_archive: &[u8], _current_exe: &Path) -> Result<()> {
Err(anyhow!("CLI self-update is only available on Linux"))
}

#[cfg(unix)]
fn find_package_dir(root: &Path) -> Result<PathBuf> {
for entry in fs::read_dir(root).context("inspect CLI update archive")? {
let path = entry?.path();
Expand All @@ -1175,6 +1180,7 @@ fn find_package_dir(root: &Path) -> Result<PathBuf> {
))
}

#[cfg(unix)]
fn validate_entrypoint_pair(primary: &Path, legacy: &Path) -> Result<()> {
let primary_status = Command::new(primary)
.arg("--version")
Expand All @@ -1198,6 +1204,7 @@ fn validate_entrypoint_pair(primary: &Path, legacy: &Path) -> Result<()> {
Ok(())
}

#[cfg(unix)]
fn validate_plugin_host_resources(directory: &Path) -> Result<()> {
for entry in ["extension-host.js"] {
let path = directory.join(entry);
Expand All @@ -1211,6 +1218,7 @@ fn validate_plugin_host_resources(directory: &Path) -> Result<()> {
Ok(())
}

#[cfg(unix)]
fn copy_plugin_host_resources(source: &Path, destination: &Path) -> Result<()> {
fs::create_dir_all(destination).with_context(|| {
format!(
Expand Down