Fix filename of the reuploaded sources
This commit is contained in:
@ -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
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user