From ebbdb6f0f798982fb337b4fd32127e4cb188aecd Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Fri, 27 Sep 2024 12:20:34 +0200 Subject: Make version picker a command --- src/Main.hs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/Main.hs') diff --git a/src/Main.hs b/src/Main.hs index d7adc88..17546fb 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -17,7 +17,6 @@ import SlackBuilder.LatestVersionCheck import SlackBuilder.Update import qualified Toml import Data.Text (Text) -import qualified Data.Text as Text import qualified Data.Text.IO as Text import Control.Monad.Trans.Reader (ReaderT(..), asks) import SlackBuilder.Package (PackageDescription(..)) @@ -117,10 +116,7 @@ autoUpdatable packageSettings = } , PackageDescription { latest = - let textArguments = TextArguments - { textURL = fromJust $ getField @"text" setting - , versionPicker = Right ["grep", "-oh", "Linux—[[:digit:].]\\+"] - } + let textArguments = uncurry TextArguments $ fromJust $ getField @"text" setting setting = fromJust $ find ((== "webex") . getField @"name") packageSettings template = Package.DownloadTemplate $ getField @"template" setting in Package.Updater @@ -146,10 +142,7 @@ autoUpdatable packageSettings = } , PackageDescription { latest = - let textArguments = TextArguments - { textURL = fromJust $ getField @"text" setting - , versionPicker = Left Text.strip - } + let textArguments = uncurry TextArguments $ fromJust $ getField @"text" setting setting = fromJust $ find ((== "dmd") . getField @"name") packageSettings template = Package.DownloadTemplate $ getField @"template" setting in Package.Updater @@ -162,10 +155,7 @@ autoUpdatable packageSettings = } , PackageDescription { latest = - let textArguments = TextArguments - { textURL = fromJust $ getField @"text" setting - , versionPicker = Left Text.strip - } + let textArguments = uncurry TextArguments $ fromJust $ getField @"text" setting setting = fromJust $ find ((== "d-tools") . getField @"name") packageSettings template = Package.DownloadTemplate $ getField @"template" setting in Package.Updater -- cgit v1.2.3