From 16c70632242f00ac424601426575feb9ea523b75 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Tue, 5 Mar 2024 23:06:32 +0100
Subject: Make local paths relative to cwd

---
 src/Main.hs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Main.hs b/src/Main.hs
index c4967ba..18cbbbf 100644
--- a/src/Main.hs
+++ b/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
-- 
cgit v1.2.3