mirrors/n-link
1
0
Fork 0
mirror of https://github.com/lights0123/n-link.git synced 2024-12-22 18:25:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix cli with an AppImage

Browse source
This commit is contained in:
lights0123 2021-04-05 16:57:18 -04:00
parent 697a7365f3
commit d2a30f97f8
No known key found for this signature in database
GPG key ID: 28F315322E37972F
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
desktop/src-tauri/src/cli.rs
View file

@ -57,6 +57,16 @@ fn get_dev() -> Option<libnspire::Handle<rusb::GlobalContext>> {
.map(|dev| libnspire::Handle::new(dev.open().unwrap()).unwrap()) .map(|dev| libnspire::Handle::new(dev.open().unwrap()).unwrap())
} }
pub fn cwd() -> PathBuf {
#[cfg(target_os = "linux")]
if std::env::var_os("APPIMAGE").is_some() && std::env::var_os("APPDIR").is_some() {
if let Some(cwd) = std::env::var_os("OWD") {
return cwd.into();
}
};
std::env::current_dir().expect("Couldn't get current directory")
}
pub fn run() -> bool { pub fn run() -> bool {
let opt: Opt = Opt::parse(); let opt: Opt = Opt::parse();
if let Some(cmd) = opt.cmd { if let Some(cmd) = opt.cmd {
@ -65,7 +75,10 @@ pub fn run() -> bool {
if let Some(handle) = get_dev() { if let Some(handle) = get_dev() {
for file in files { for file in files {
let mut buf = vec![]; let mut buf = vec![];
File::open(&file).unwrap().read_to_end(&mut buf).unwrap(); File::open(cwd().join(&file))
.unwrap()
.read_to_end(&mut buf)
.unwrap();
let name = file let name = file
.file_name() .file_name()
.expect("Failed to get file name") .expect("Failed to get file name")