diff options
| author | Eugen Wissner <belka@caraus.de> | 2024-05-25 07:54:05 +0200 |
|---|---|---|
| committer | Eugen Wissner <belka@caraus.de> | 2024-05-25 07:54:05 +0200 |
| commit | 6d0248b4f845b5995457acbf78606473d2f3d186 (patch) | |
| tree | 42e0e0566c329cdd6a501b5021eb04a30ea4aef5 | |
| parent | c81cabfcbfd2b91a7ce82168fdea4f9af6788b62 (diff) | |
| download | slackbuilder-6d0248b4f845b5995457acbf78606473d2f3d186.tar.gz | |
Fix archive name generation
| -rw-r--r-- | lib/SlackBuilder/Download.hs | 2 | ||||
| -rw-r--r-- | src/SlackBuilder/Update.hs | 2 |
2 files changed, 3 insertions, 1 deletions
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' |