diff options
| author | Namilskyy <alive6863@gmail.com> | 2025-12-07 19:14:35 +0300 |
|---|---|---|
| committer | Namilskyy <alive6863@gmail.com> | 2025-12-07 19:14:35 +0300 |
| commit | b55537c7d2652d1f5b389cce503cc176d1f970ec (patch) | |
| tree | a2d99e08b55dcf499c2cb4ffc2061cc981308eb8 /src/pkgtoolkit/archive.rs | |
| parent | 778a979e2e774e1b2e91227fa2db2e56d41927c1 (diff) | |
Code refactors, minor fixes
Diffstat (limited to 'src/pkgtoolkit/archive.rs')
| -rw-r--r-- | src/pkgtoolkit/archive.rs | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/pkgtoolkit/archive.rs b/src/pkgtoolkit/archive.rs index eef0888..db10f01 100644 --- a/src/pkgtoolkit/archive.rs +++ b/src/pkgtoolkit/archive.rs @@ -49,7 +49,7 @@ impl ArchiveOperations for Package { let file = File::open(path_to_archive)?; let gz = GzDecoder::new(file); let mut archive = Archive::new(gz); - + // Unpack into temporary directory match archive.unpack(&temp_dir) { Ok(()) => Ok(()), @@ -87,7 +87,7 @@ impl ArchiveOperations for Package { let root_install = temp_dir.join("INSTALL"); if root_install.exists() { install_path = Some(root_install); - pkg_dir_name = Some("package".to_string()); + pkg_dir_name = Some("package".to_string()); } else { for entry in fs::read_dir(&temp_dir)? { let entry = entry?; @@ -96,7 +96,8 @@ impl ArchiveOperations for Package { let install_in_subdir = path.join("INSTALL"); if install_in_subdir.exists() { install_path = Some(install_in_subdir); - pkg_dir_name = Some(path.file_name().unwrap().to_string_lossy().to_string()); + pkg_dir_name = + Some(path.file_name().unwrap().to_string_lossy().to_string()); break; } } @@ -104,19 +105,19 @@ impl ArchiveOperations for Package { } let install_path = install_path.ok_or_else(|| { - io::Error::new( - io::ErrorKind::NotFound, - "INSTALL file not found in archive", - ) + io::Error::new(io::ErrorKind::NotFound, "INSTALL file not found in archive") })?; let install_content = fs::read_to_string(&install_path)?; let install_meta: Install = toml::from_str(&install_content) .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?; - let final_dir_name = format!("{}-{}", install_meta.package.name, install_meta.package.version); + let final_dir_name = format!( + "{}-{}", + install_meta.package.name, install_meta.package.version + ); let final_dir = Path::new(cache_dir).join(&final_dir_name); - + if final_dir.exists() { fs::remove_dir_all(&final_dir)?; } @@ -177,12 +178,12 @@ impl ArchiveOperations for Package { group = "root" mode = "755" - Also [install] can be + Also [install] can be path = "/usr/bin/my-package" user = "root" group = "root" mode = "755" - custom_script = "./install.sh" OR + custom_script = "./install.sh" OR custom_script = """ echo "Installing my-package" sudo apt-get install my-package @@ -194,7 +195,10 @@ impl ArchiveOperations for Package { fs::create_dir_all(&config.paths.cache_dir)?; let cache_dir = &config.paths.cache_dir; - let pkg_dir_name = format!("{}-{}", minimal_package_meta.name, minimal_package_meta.version); + let pkg_dir_name = format!( + "{}-{}", + minimal_package_meta.name, minimal_package_meta.version + ); let install_path = Path::new(cache_dir).join(format!("{}/INSTALL", pkg_dir_name)); let setts_path = Path::new(cache_dir).join(format!("{}/SETTS", pkg_dir_name)); let build_path = Path::new(cache_dir).join(format!("{}/BUILD", pkg_dir_name)); |
