itsscb/espup
1
0
Fork 0
mirror of https://github.com/esp-rs/espup.git synced 2025-10-02 23:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ⚡️ Use absolute path of export-file

Browse Source
This commit is contained in:
Sergio Gasquez 2022-11-05 09:43:41 +00:00
parent fe31e43a57
commit 945ec4588f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@ -23,7 +23,7 @@ use espup::{
use log::{debug, info, warn}; use log::{debug, info, warn};
use std::{ use std::{
collections::HashSet, collections::HashSet,
fs::{canonicalize, remove_dir_all, remove_file, File}, fs::{remove_dir_all, remove_file, File},
io::Write, io::Write,
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
@ -131,7 +131,12 @@ fn install(args: InstallOpts) -> Result<()> {
let host_triple = get_host_triple(args.default_host)?; let host_triple = get_host_triple(args.default_host)?;
let mut extra_crates: HashSet<Crate> = args.extra_crates.split(',').map(Crate::new).collect(); let mut extra_crates: HashSet<Crate> = args.extra_crates.split(',').map(Crate::new).collect();
let mut exports: Vec<String> = Vec::new(); let mut exports: Vec<String> = Vec::new();
let export_file = args.export_file.clone(); let export_file = if args.export_file.is_absolute() {
args.export_file
} else {
let current_dir = std::env::current_dir()?;
current_dir.join(args.export_file)
};
let xtensa_rust = if targets.contains(&Target::ESP32) let xtensa_rust = if targets.contains(&Target::ESP32)
|| targets.contains(&Target::ESP32S2) || targets.contains(&Target::ESP32S2)
|| targets.contains(&Target::ESP32S3) || targets.contains(&Target::ESP32S3)
@ -164,7 +169,7 @@ fn install(args: InstallOpts) -> Result<()> {
host_triple, host_triple,
targets, targets,
&args.espidf_version, &args.espidf_version,
export_file, &export_file,
&extra_crates, &extra_crates,
llvm, llvm,
&args.nightly_version, &args.nightly_version,
@ -214,7 +219,7 @@ fn install(args: InstallOpts) -> Result<()> {
info!("{} Saving configuration file", emoji::WRENCH); info!("{} Saving configuration file", emoji::WRENCH);
let config = Config { let config = Config {
espidf_version: args.espidf_version, espidf_version: args.espidf_version,
export_file: canonicalize(&export_file)?, export_file,
extra_crates: extra_crates extra_crates: extra_crates
.iter() .iter()
.map(|x| x.name.clone()) .map(|x| x.name.clone())
@ -371,7 +376,7 @@ pub fn export_environment(export_file: &PathBuf, exports: &[String]) -> Result<(
); );
#[cfg(unix)] #[cfg(unix)]
warn!( warn!(
"{} PLEASE set up the environment variables running: '. ./{}'", "{} PLEASE set up the environment variables running: '. {}'",
emoji::INFO, emoji::INFO,
export_file.display() export_file.display()
); );