Make local paths relative to cwd
Some checks failed
Build / test (push) Failing after 5m55s
Build / audit (push) Successful in 13m8s

This commit is contained in:
2024-03-05 23:06:32 +01:00
parent cd15b25db1
commit 16c7063224
3 changed files with 22 additions and 32 deletions

View File

@ -391,11 +391,7 @@ downloadWithTemplate :: Package.DownloadTemplate -> Text -> Text -> SlackBuilder
downloadWithTemplate downloadTemplate packagePath version = do
repository' <- SlackBuilderT $ asks repository
uri' <- liftIO $ Package.renderDownloadWithVersion downloadTemplate version
let downloadFileName = URI.unRText
$ NonEmpty.last $ snd $ fromJust $ URI.uriPath uri'
relativeTarball = packagePath <> "/" <> downloadFileName
tarball = repository' </> Text.unpack relativeTarball
checksum <- download uri' tarball
checksum <- download uri' $ repository' </> Text.unpack packagePath
pure $ Package.Download uri' $ snd checksum
reuploadWithTemplate :: Package.DownloadTemplate -> [CmdSpec] -> Text -> Text -> SlackBuilderT Package.Download
@ -409,10 +405,7 @@ reuploadWithTemplate downloadTemplate commands packagePath version = do
(checksum, relativeTarball') <- case commands of
[] -> do
let relativeTarball = packagePathRelativeToCurrent
</> downloadFileName
(downloadedFileName, checksum) <- download uri'
$ repository' </> relativeTarball
(downloadedFileName, checksum) <- download uri' packagePathRelativeToCurrent
pure (checksum, packagePathRelativeToCurrent </> downloadedFileName)
_ -> do
changedArchiveRootName <- extractRemote uri' packagePathRelativeToCurrent