From 6d0248b4f845b5995457acbf78606473d2f3d186 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sat, 25 May 2024 07:54:05 +0200 Subject: [PATCH] Fix archive name generation --- lib/SlackBuilder/Download.hs | 2 ++ src/SlackBuilder/Update.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/SlackBuilder/Download.hs b/lib/SlackBuilder/Download.hs index 53e609c..088f2cc 100644 --- a/lib/SlackBuilder/Download.hs +++ b/lib/SlackBuilder/Download.hs @@ -186,6 +186,8 @@ cloneAndArchive repo tarballPath tagPrefix = do >> createLzmaTarball repositoryTarballPath repositoryArchivePath >> removePathForcibly repositoryTarballPath +-- | Takes a directory as input and a file name as output and creates a tar.xz +-- archive from the given directory. createLzmaTarball :: FilePath -> FilePath -> IO (Digest MD5) createLzmaTarball input output = runConduitRes $ yield input .| void tarFilePath diff --git a/src/SlackBuilder/Update.hs b/src/SlackBuilder/Update.hs index c515f4b..fa7dda1 100644 --- a/src/SlackBuilder/Update.hs +++ b/src/SlackBuilder/Update.hs @@ -179,7 +179,7 @@ reuploadWithTemplate downloadTemplate commands packagePath version = do appendTarExtension = (<.> "tar.xz") in fmap (appendTarExtension tarballPath,) $ withCurrentDirectory (takeDirectory tarballPath) - $ createLzmaTarball archiveBaseFilename archiveBaseFilename + $ createLzmaTarball archiveBaseFilename (appendTarExtension archiveBaseFilename) handleReupload relativeTarball = do liftIO $ putStrLn $ "Upload the source tarball " <> relativeTarball uploadSource relativeTarball category'