Make local paths relative to cwd
This commit is contained in:
11
src/Main.hs
11
src/Main.hs
@ -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
|
||||
|
Reference in New Issue
Block a user