beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-21 18:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

try fixing #132 by using shellexpand-utils

Browse source 
https://todo.sr.ht/~soywod/pimalaya/132
This commit is contained in:
Clément DOUIN 2023-08-29 11:28:20 +02:00
parent 606162452e
commit 4b60379070
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
3 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Cargo.lock generated
View file

@ -232,6 +232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
dependencies = [
"memchr 2.5.0",
"regex-automata",
"serde",
]
@ -999,9 +1000,9 @@ dependencies = [
[[package]]
name = "email-lib"
version = "0.15.0"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b24c6a2ef2ffbfe518b531ee5cc252ed6014e3cbfe1734e7cece299dbd12eb1b"
checksum = "466e49f407767ae105ac1821997b272bf63f8d06e67892582ff71a991dfc8852"
dependencies = [
"advisory-lock",
"ammonia",
@ -1034,7 +1035,7 @@ dependencies = [
"rustls 0.21.1",
"rustls-native-certs",
"secret-lib",
"shellexpand",
"shellexpand-utils",
"thiserror",
"tokio",
"tokio-rustls 0.24.0",
@ -1507,7 +1508,7 @@ dependencies = [
"secret-lib",
"serde",
"serde_json",
"shellexpand",
"shellexpand-utils",
"tempfile",
"termcolor",
"terminal_size",
@ -2179,9 +2180,9 @@ dependencies = [
[[package]]
name = "mml-lib"
version = "0.2.1"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f87247d31f8b76ac7e5d2e23395a83f54978a8716318db6e66a026f50f9288e3"
checksum = "d9ebec291020a02ef208ca54491b44a929c93c93dcd47be594fc3843ece0104b"
dependencies = [
"async-recursion",
"chumsky 0.9.0",
@ -2194,7 +2195,7 @@ dependencies = [
"pgp-lib",
"process-lib",
"secret-lib",
"shellexpand",
"shellexpand-utils",
"thiserror",
"tree_magic",
]
@ -2367,6 +2368,9 @@ name = "os_str_bytes"
version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
dependencies = [
"memchr 2.5.0",
]
[[package]]
name = "ouroboros"
@ -2879,6 +2883,12 @@ dependencies = [
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
[[package]]
name = "regex-syntax"
version = "0.7.2"
@ -3316,11 +3326,24 @@ dependencies = [
[[package]]
name = "shellexpand"
version = "2.1.2"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
dependencies = [
"bstr",
"dirs",
"os_str_bytes",
]
[[package]]
name = "shellexpand-utils"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b44114d15a72740d3049e739929d0f4af335ba2eb855ea0f1fa2bfb4d7066215"
dependencies = [
"log",
"shellexpand",
"thiserror",
]
[[package]]

8
Cargo.toml
View file

@ -82,7 +82,7 @@ version = "0.7.0"
version = "1.16.0"
[dependencies.email-lib]
version = "=0.15.0"
version = "=0.15.2"
default-features = false
[dependencies.keyring-lib]
@ -95,7 +95,7 @@ version = "=0.1.0"
version = "=0.1.0"
[dependencies.mml-lib]
version = "=0.2.1"
version = "=0.2.3"
[dependencies.secret-lib]
version = "=0.1.0"
@ -107,8 +107,8 @@ features = ["derive"]
[dependencies.serde_json]
version = "1.0"
[dependencies.shellexpand]
version = "2.1"
[dependencies.shellexpand-utils]
version = "=0.1.0"
[dependencies.termcolor]
version = "1.1"

7
src/config/wizard.rs
View file

@ -3,7 +3,8 @@ use crate::account;
use anyhow::Result;
use dialoguer::{theme::ColorfulTheme, Confirm, Input, Password, Select};
use once_cell::sync::Lazy;
use std::{env, fs, io, path::PathBuf, process};
use shellexpand_utils::{shellexpand_path, try_shellexpand_path};
use std::{env, fs, io, process};
#[macro_export]
macro_rules! wizard_warn {
@ -92,9 +93,9 @@ pub(crate) async fn configure() -> Result<DeserializedConfig> {
.to_string_lossy()
.to_string(),
)
.validate_with(|path: &String| shellexpand::full(path).map(|_| ()))
.validate_with(|path: &String| try_shellexpand_path(path).map(|_| ()))
.interact()?;
let path: PathBuf = shellexpand::full(&path).unwrap().to_string().into();
let path = shellexpand_path(&path);
println!("Writing the configuration to {path:?}…");