From 5e161c3dade570b7a1687c01647b37cfe44f1bd5 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Sun, 8 Oct 2023 12:28:46 +0200
Subject: Support modifying reuploaded tarballs

---
 lib/SlackBuilder/Config.hs  | 10 +++-------
 lib/SlackBuilder/Info.hs    |  4 ++--
 lib/SlackBuilder/Package.hs |  5 ++---
 3 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/SlackBuilder/Config.hs b/lib/SlackBuilder/Config.hs
index 1cb493b..d94000c 100644
--- a/lib/SlackBuilder/Config.hs
+++ b/lib/SlackBuilder/Config.hs
@@ -17,10 +17,8 @@ data Settings = Settings
     , maintainer :: MaintainerSettings
     } deriving (Eq, Show)
 
-data MaintainerSettings = MaintainerSettings
-    { name :: !Text
-    , email :: !Text
-    , signature :: !Bool
+newtype MaintainerSettings = MaintainerSettings
+    { signature :: Bool
     } deriving (Eq, Show)
 
 settingsCodec :: Toml.TomlCodec Settings
@@ -34,6 +32,4 @@ settingsCodec = Settings
 
 maintainerSettingsCodec :: Toml.TomlCodec MaintainerSettings
 maintainerSettingsCodec = MaintainerSettings
-    <$> Toml.text "name" .= name
-    <*> Toml.text "email" .= email
-    <*> Toml.bool "signature" .= signature
+    <$> Toml.bool "signature" .= signature
diff --git a/lib/SlackBuilder/Info.hs b/lib/SlackBuilder/Info.hs
index f1631d9..3ac2e5b 100644
--- a/lib/SlackBuilder/Info.hs
+++ b/lib/SlackBuilder/Info.hs
@@ -174,8 +174,8 @@ generate pkg = Lazy.Text.toStrict $ Text.Builder.toLazyText builder
         <> "HOMEPAGE=\"" <> Text.Builder.fromText (homepage pkg) <> "\"\n"
         <> generateMultiEntry "DOWNLOAD" (render <$> downloads pkg)
         <> generateMultiEntry "MD5SUM" (digestToText <$> checksums pkg)
-        <> generateMultiEntry "DOWNLOAD_x86_64" (render <$> downloads pkg)
-        <> generateMultiEntry "MD5SUM_x86_64" (digestToText <$> checksums pkg)
+        <> generateMultiEntry "DOWNLOAD_x86_64" (render <$> downloadX64 pkg)
+        <> generateMultiEntry "MD5SUM_x86_64" (digestToText <$> checksumX64 pkg)
         <> "REQUIRES=\"" <> fromByteStringWords (requires pkg) <> "\"\n"
         <> "MAINTAINER=\"" <> Text.Builder.fromText (maintainer pkg) <> "\"\n"
         <> "EMAIL=\"" <> Text.Builder.fromText (email pkg) <> "\"\n"
diff --git a/lib/SlackBuilder/Package.hs b/lib/SlackBuilder/Package.hs
index 4371040..f940072 100644
--- a/lib/SlackBuilder/Package.hs
+++ b/lib/SlackBuilder/Package.hs
@@ -17,15 +17,14 @@ import qualified Text.URI as URI
 import Crypto.Hash (Digest, MD5)
 import SlackBuilder.Trans
 import Control.Monad.Catch (MonadThrow)
+import System.Process (CmdSpec(..))
 
 -- | Contains information how a package can be updated.
 data Package = Package
     { latest :: Updater
     , category :: Text
     , name :: Text
-    , homepage :: URI
-    , requires :: [Text]
-    , reupload :: Bool
+    , reupload :: Maybe [CmdSpec]
     }
 
 -- | Download URI with the MD5 checksum of the target.
-- 
cgit v1.2.3