diff options
| author | Eugen Wissner <belka@caraus.de> | 2024-05-13 18:26:23 +0200 |
|---|---|---|
| committer | Eugen Wissner <belka@caraus.de> | 2024-05-13 18:26:23 +0200 |
| commit | 3b7b15f381fbee648784895067cff165f975c360 (patch) | |
| tree | ad961b8299ef94cdf03d5688498b0b8ba77f3bdf /src | |
| parent | f8ef93fde7dd5e9da499514c4ba6b782e5ec35b2 (diff) | |
| download | slackbuilder-3b7b15f381fbee648784895067cff165f975c360.tar.gz | |
Fix filename of the reuploaded sources
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main.hs | 2 | ||||
| -rw-r--r-- | src/SlackBuilder/Update.hs | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Main.hs b/src/Main.hs index a40bd2d..1ea73da 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -227,7 +227,7 @@ autoUpdatable = dcdArguments = PackageOwner{ owner = "dlang-community", name = "DCD" } latestDub = Package.Updater { detectLatest = latestGitHub dubArguments "(v)\\." - , getVersion = downloadWithTemplate dubTemplate + , getVersion = reuploadWithTemplate dubTemplate [] , is64 = False } latestDscanner = Package.Updater diff --git a/src/SlackBuilder/Update.hs b/src/SlackBuilder/Update.hs index a23ee48..918db66 100644 --- a/src/SlackBuilder/Update.hs +++ b/src/SlackBuilder/Update.hs @@ -46,7 +46,7 @@ import SlackBuilder.Package (PackageDescription(..), PackageUpdateData(..)) import qualified SlackBuilder.Package as Package import SlackBuilder.Trans import Text.Megaparsec (parse, errorBundlePretty) -import Text.URI (URI(..), mkURI) +import Text.URI (URI(..)) import qualified Text.URI as URI import System.Directory ( listDirectory @@ -169,7 +169,7 @@ reuploadWithTemplate downloadTemplate commands packagePath version = do </> fromMaybe downloadFileName changedArchiveRootName prepareSource relativeTarball - download' <- handleReupload relativeTarball' downloadFileName + download' <- handleReupload relativeTarball' pure $ Package.Download download' checksum where category' = Text.pack $ takeBaseName $ Text.unpack packagePath @@ -186,12 +186,13 @@ reuploadWithTemplate downloadTemplate commands packagePath version = do .| void tarFilePath .| Lzma.compress Nothing .| sinkFileAndHash (appendTarExtension archiveBaseFilename) - handleReupload relativeTarball downloadFileName = do - downloadURL' <- SlackBuilderT $ asks downloadURL - + handleReupload relativeTarball = do liftIO $ putStrLn $ "Upload the source tarball " <> relativeTarball uploadSource relativeTarball category' - liftIO $ mkURI $ downloadURL' <> "/" <> category' <> "/" <> Text.pack downloadFileName + + hostedSources $ NonEmpty.cons category' + $ pure $ Text.pack $ takeFileName relativeTarball + defaultCreateProcess cwd' cmdSpec = flip withCreateProcess (const . const . const waitForProcess) $ CreateProcess |