working
This commit is contained in:
parent
85b4ad55b3
commit
30b6245514
3 changed files with 4 additions and 5 deletions
|
|
@ -49,7 +49,7 @@ pub fn download_files(
|
||||||
let md5_map = md5_map.clone();
|
let md5_map = md5_map.clone();
|
||||||
|
|
||||||
let handle = thread::spawn(move || -> Result<(), Box<dyn std::error::Error + Send>> {
|
let handle = thread::spawn(move || -> Result<(), Box<dyn std::error::Error + Send>> {
|
||||||
let filename = url.split('/').last().unwrap_or("file.tar.xz");
|
let filename = url.split('/').next_back().unwrap_or("file.tar.xz");
|
||||||
let filepath = target_dir.join(filename);
|
let filepath = target_dir.join(filename);
|
||||||
|
|
||||||
let download_url = if let Some(ref mirror) = package_mirror {
|
let download_url = if let Some(ref mirror) = package_mirror {
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let lfs_sources = match env::var("LFS") {
|
let lfs_sources = match env::var("LFS") {
|
||||||
Ok(lfs) => PathBuf::from(lfs).join("sources"),
|
Ok(lfs) => PathBuf::from(lfs).join("sources"),
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
let mut rng = rand::thread_rng();
|
let mut rng = rand::rng();
|
||||||
let random_number: u32 = rng.gen_range(1000..=9999);
|
let random_number: u32 = rng.random_range(1000..=9999);
|
||||||
let tmp_path = format!("/tmp/lfs_{}", random_number);
|
let tmp_path = format!("/tmp/lfs_{}", random_number);
|
||||||
println!(
|
println!(
|
||||||
"{} Using temporary path {}",
|
"{} Using temporary path {}",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
pub fn run_command(cmd: &str, args: &[&str]) -> Option<String> {
|
pub fn run_command(cmd: &str, args: &[&str]) -> Option<String> {
|
||||||
let output = Command::new(cmd).args(args).output().ok()?;
|
let output = Command::new(cmd).args(args).output().ok()?;
|
||||||
|
|
@ -12,7 +11,7 @@ pub fn run_command(cmd: &str, args: &[&str]) -> Option<String> {
|
||||||
|
|
||||||
pub fn check_version(installed: &str, required: &str) -> bool {
|
pub fn check_version(installed: &str, required: &str) -> bool {
|
||||||
let parse_ver = |v: &str| {
|
let parse_ver = |v: &str| {
|
||||||
v.split(|c| c == '.' || c == '-')
|
v.split(['.', '-'])
|
||||||
.filter_map(|s| s.parse::<u32>().ok())
|
.filter_map(|s| s.parse::<u32>().ok())
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue