From c81cabfcbfd2b91a7ce82168fdea4f9af6788b62 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 14 May 2024 19:05:41 +0200 Subject: Replace extern rm rf call with a function --- src/SlackBuilder/Update.hs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/SlackBuilder/Update.hs') diff --git a/src/SlackBuilder/Update.hs b/src/SlackBuilder/Update.hs index 918db66..c515f4b 100644 --- a/src/SlackBuilder/Update.hs +++ b/src/SlackBuilder/Update.hs @@ -61,13 +61,10 @@ import System.Console.ANSI , Color(..) , ConsoleLayer(..) ) -import Control.Monad (filterM, void) +import Control.Monad (filterM) import Data.List (isPrefixOf, isSuffixOf, partition) -import Conduit (runConduitRes, (.|), yield) import Data.Functor ((<&>)) import Data.Bifunctor (Bifunctor(..)) -import Data.Conduit.Tar (tarFilePath) -import qualified Data.Conduit.Lzma as Lzma getAndLogLatest :: PackageDescription -> SlackBuilderT (Maybe PackageUpdateData) getAndLogLatest description = do @@ -182,10 +179,7 @@ reuploadWithTemplate downloadTemplate commands packagePath version = do appendTarExtension = (<.> "tar.xz") in fmap (appendTarExtension tarballPath,) $ withCurrentDirectory (takeDirectory tarballPath) - $ runConduitRes $ yield archiveBaseFilename - .| void tarFilePath - .| Lzma.compress Nothing - .| sinkFileAndHash (appendTarExtension archiveBaseFilename) + $ createLzmaTarball archiveBaseFilename archiveBaseFilename handleReupload relativeTarball = do liftIO $ putStrLn $ "Upload the source tarball " <> relativeTarball uploadSource relativeTarball category' -- cgit v1.2.3