Skip to content

Commit f33816c

Browse files
committed
unpack: un-nest archive_name_to_env_name()
1 parent fb571a3 commit f33816c

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

src/env/unpack.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ pub struct Args {
1717
pub archive_path: PathBuf,
1818
}
1919

20+
fn archive_name_to_env_name(archive_path: &Path) -> Option<String> {
21+
let filename = archive_path.file_name()?.to_str()?;
22+
filename
23+
.strip_suffix(".tar.gz")
24+
.or_else(|| filename.strip_suffix(".tgz"))
25+
.map(String::from)
26+
}
27+
2028
pub fn run(config: Config, args: Args) -> Result<(), ExitCode> {
21-
fn archive_name_to_env_name(archive_path: &Path) -> Option<String> {
22-
let filename = archive_path.file_name()?.to_str()?;
23-
filename
24-
.strip_suffix(".tar.gz")
25-
.or_else(|| filename.strip_suffix(".tgz"))
26-
.map(String::from)
27-
}
2829
let env_name = match args.common.name {
2930
Some(name) => name,
3031
None => match archive_name_to_env_name(&args.archive_path) {

0 commit comments

Comments
 (0)