tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-15 05:31:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): resolve absolute tauri binary path for the android template (#5015)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2022-08-23 13:54:41 -03:00 committed by GitHub
parent 2b846f413c
commit 3668a1fdc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tooling/cli/src/mobile/init.rs
View File

@ -127,11 +127,19 @@ pub fn exec(
let (handlebars, mut map) = handlebars(&config);
let mut args = std::env::args_os();
// TODO: make this a relative path
let tauri_binary = args
.next()
.map(|bin| {
let path = PathBuf::from(&bin);
if path.exists() {
if let Ok(dir) = current_dir() {
let absolute_path = util::prefix_path(dir, path);
return absolute_path.into();
}
}
bin
})
.unwrap_or_else(|| std::ffi::OsString::from("cargo"));
map.insert("tauri-binary", tauri_binary.to_string_lossy());
let mut build_args = Vec::new();
for arg in args {
let path = PathBuf::from(&arg);
@ -148,6 +156,7 @@ pub fn exec(
}
}
build_args.push(target.ide_build_script_name().into());
map.insert("tauri-binary", tauri_binary.to_string_lossy());
map.insert("tauri-binary-args", &build_args);
map.insert("tauri-binary-args-str", build_args.join(" "));