summaryrefslogtreecommitdiff
path: root/src/SlackBuilder/Update.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/SlackBuilder/Update.hs')
-rw-r--r--src/SlackBuilder/Update.hs13
1 files changed, 7 insertions, 6 deletions
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