src/cleanup/mod.rs

@@ -1,51 +0,0 @@
-use {
-    super::Hooks,
-    crate::{InstallError, InstallMessage},
-    rayon::prelude::{IntoParallelRefIterator, ParallelIterator},
-    std::{error::Error, sync::mpsc::Sender},
-};
-
-#[derive(Debug, Default)]
-pub struct Cleanup {
-    hooks: Vec<Hooks>,
-}
-
-impl Cleanup {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn push(&mut self, hook: Hooks) {
-        match hook {
-            Hooks::Info(_) | Hooks::User(_, _) | Hooks::Group(_, _) | Hooks::Pinstall(_) => {
-                self.hooks.push(hook)
-            }
-            Hooks::Man | Hooks::GlibSchema => {
-                if !self.hooks.contains(&hook) {
-                    self.hooks.push(hook);
-                }
-            }
-        }
-    }
-
-    pub fn run(&self, sender: Sender<InstallMessage>) -> Result<(), Box<dyn Error>> {
-        self.hooks
-            .par_iter()
-            .try_for_each_with(sender, |sender, hook| {
-                let output = hook.run()?;
-                match hook {
-                    Hooks::Man => sender.send(InstallMessage::Man)?,
-                    Hooks::Info(s) => sender.send(InstallMessage::Info(s.clone()))?,
-                    Hooks::GlibSchema => sender.send(InstallMessage::GlibSchemas)?,
-                    Hooks::User(u, _) => sender.send(InstallMessage::UserCreated(u.clone()))?,
-                    Hooks::Group(g, _) => sender.send(InstallMessage::GroupCreated(g.clone()))?,
-                    Hooks::Pinstall(_) => {
-                        sender.send(InstallMessage::PostInstallStdout(output.stdout))?;
-                        sender.send(InstallMessage::PostInstallStderr(output.stderr))?;
-                    }
-                }
-                Ok::<(), InstallError>(())
-            })?;
-        Ok(())
-    }
-}

src/hpk.rs

@@ -5,7 +5,7 @@ mod cli;
 use {
     clap::ArgMatches,
     cli::cli,
-    hpk::{Cleanup, CreationError, Creator, Dependency, InstallMessage, Installer, Message, Specs, Version},
+    hpk::{CreationError, Creator, Dependency, InstallMessage, Installer, Message, Specs, Version},
     indicatif::{ProgressBar, ProgressStyle},
     ron::ser::{to_writer_pretty, PrettyConfig},
     std::{
@@ -136,7 +136,7 @@ fn install_local<P: AsRef<OsStr> + fmt::Display>(
             }
         }
     });
-    let mut hooks = Cleanup::new();
+    let mut hooks = vec![];
     installer.install(&mut hooks, sender)?;
     match handle.join() {
         Ok(package) => {

src/installer/mod.rs

@@ -3,7 +3,6 @@ pub use error::Error;
 
 use {
     crate::{
-        Cleanup,
         tar::{Archive, Node},
         Entry, Group, Hooks, Package, Pinstall, User,
     },
@@ -24,14 +23,12 @@ use {
     zstd::Decoder,
 };
 
-#[derive(Debug)]
 /// Represents a symbolic link
 pub struct Link {
     pub path: PathBuf,
     pub target: PathBuf,
 }
 
-#[derive(Debug)]
 /// Messages sent from and `Installer` to the calling thread
 pub enum InstallMessage {
     ArchiveRead,
@@ -49,15 +46,9 @@ pub enum InstallMessage {
     /// A `Group` has been successfully created
     GroupCreated(Group),
     /// The output of the post install script sent to stdout
-    PostInstallStdout(Vec<u8>),
+    PostInstallStdout(String),
     /// The output of the post install script sent to stderr
-    PostInstallStderr(Vec<u8>),
-    /// Update the mandoc db
-    Man,
-    /// Update the info db
-    Info(String),
-    /// Glib schemas updated
-    GlibSchemas,
+    PostInstallStderr(String),
 }
 
 /// Installs a package into it's specified rootfs
@@ -87,7 +78,7 @@ impl<T: io::Read> Installer<T> {
 
     pub fn install(
         self,
-        hooks: &mut Cleanup,
+        hooks: &mut Vec<Hooks>,
         sender: Sender<InstallMessage>,
     ) -> Result<Package, Error> {
         let reader = Decoder::new(self.reader)?;
@@ -137,7 +128,9 @@ impl<T: io::Read> Installer<T> {
                 if let Some(s) = node.header.prefix() {
                     if s.contains("/share/man/") {
                         let mut h = hooks.lock().unwrap();
+                        if !h.contains(&Hooks::Man) {
                             h.push(Hooks::Man);
+                        }
                     } else if s.contains("/share/info") {
                         hooks
                             .lock()
@@ -145,9 +138,11 @@ impl<T: io::Read> Installer<T> {
                             .push(Hooks::Info(fpath.to_str().unwrap().to_string()));
                     } else if s.contains("/share/glib-2.0/schemas") {
                         let mut h = hooks.lock().unwrap();
+                        if !h.contains(&Hooks::GlibSchema) {
                             h.push(Hooks::GlibSchema);
                         }
                     }
+                }
                 // Match up a package entry with a tar node
                 let entry = package
                     .plist
@@ -239,7 +234,7 @@ fn pop_appstream(archive: &mut Archive, db_pkgdir: &Path) -> Result<(), Error> {
 
 fn pop_pinstall(
     archive: &mut Archive,
-    hooks: &mut Cleanup,
+    hooks: &mut Vec<Hooks>,
     pkgname: &str,
     root: &Path,
 ) -> Result<(), Error> {

src/lib.rs

@@ -1,6 +1,5 @@
 #![warn(clippy::all, clippy::pedantic)]
 #![allow(clippy::must_use_candidate, clippy::missing_errors_doc)]
-mod cleanup;
 mod creator;
 mod db;
 mod hooks;
@@ -15,7 +14,6 @@ mod version;
 use std::path::PathBuf;
 
 pub use {
-    cleanup::Cleanup,
     creator::{CreationError, Creator, Message},
     db::Database,
     hooks::{Hooks, Pinstall},