Fix ghcup-gen validation for global tools

app/ghcup-gen/Main.hs

@@ -69,13 +69,15 @@ tarballFilterP = option readm $
   long "tarball-filter" <> short 'u' <> metavar "<tool>-<version>" <> value def
     <> help "Only check certain tarballs (format: <tool>-<version>)"
   where
-    def = TarballFilter Nothing (makeRegex ("" :: String))
+    def = TarballFilter (Right Nothing) (makeRegex ("" :: String))
     readm = do
       s <- str
       case span (/= '-') s of
         (_, []) -> fail "invalid format, missing '-' after the tool name"
         (t, v) | [tool] <- [ tool | tool <- [minBound..maxBound], low (show tool) == low t ] ->
-          pure (TarballFilter $ Just tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
+          pure (TarballFilter $ Right $ Just tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
+        (t, v) | [tool] <- [ tool | tool <- [minBound..maxBound], low (show tool) == low t ] ->
+          pure (TarballFilter $ Left tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
         _ -> fail "invalid tool"
     low = fmap toLower
 
@@ -105,23 +107,18 @@ main :: IO ()
 main = do
   _ <- customExecParser (prefs showHelpOnError) (info (opts <**> helper) idm)
     >>= \Options {..} -> case optCommand of
-          ValidateYAML vopts -> case vopts of
+          ValidateYAML vopts -> withValidateYamlOpts vopts validate
-            ValidateYAMLOpts { vInput = Nothing } ->
+          ValidateTarballs vopts tarballFilter -> withValidateYamlOpts vopts (validateTarballs tarballFilter)
-              B.getContents >>= valAndExit validate
-            ValidateYAMLOpts { vInput = Just StdInput } ->
-              B.getContents >>= valAndExit validate
-            ValidateYAMLOpts { vInput = Just (FileInput file) } ->
-              B.readFile file >>= valAndExit validate
-          ValidateTarballs vopts tarballFilter -> case vopts of
-            ValidateYAMLOpts { vInput = Nothing } ->
-              B.getContents >>= valAndExit (validateTarballs tarballFilter)
-            ValidateYAMLOpts { vInput = Just StdInput } ->
-              B.getContents >>= valAndExit (validateTarballs tarballFilter)
-            ValidateYAMLOpts { vInput = Just (FileInput file) } ->
-              B.readFile file >>= valAndExit (validateTarballs tarballFilter)
   pure ()
 
  where
+  withValidateYamlOpts vopts f = case vopts of
+    ValidateYAMLOpts { vInput = Nothing } ->
+      B.getContents >>= valAndExit f
+    ValidateYAMLOpts { vInput = Just StdInput } ->
+      B.getContents >>= valAndExit f
+    ValidateYAMLOpts { vInput = Just (FileInput file) } ->
+      B.readFile file >>= valAndExit f
   valAndExit f contents = do
     (GHCupInfo _ av gt) <- case Y.decodeEither' contents of
       Right r -> pure r

app/ghcup-gen/Validate.hs

@@ -184,7 +184,7 @@ validate dls _ = do
   isBase _        = False
 
 data TarballFilter = TarballFilter
-  { tfTool    :: Maybe Tool
+  { tfTool    :: Either GlobalTool (Maybe Tool)
   , tfVersion :: Regex
   }
 
@@ -201,17 +201,16 @@ validateTarballs :: ( Monad m
                  -> GHCupDownloads
                  -> M.Map GlobalTool DownloadInfo
                  -> m ExitCode
-validateTarballs (TarballFilter tool versionRegex) dls gt = do
+validateTarballs (TarballFilter etool versionRegex) dls gt = do
   ref <- liftIO $ newIORef 0
 
   flip runReaderT ref $ do
      -- download/verify all tarballs
-    let dlis = nubOrd $ dls ^.. each %& indices (maybe (const True) (==) tool) %> each %& indices (matchTest versionRegex . T.unpack . prettyVer) % (viSourceDL % _Just `summing` viArch % each % each % each)
+    let dlis = either (const []) (\tool -> nubOrd $ dls ^.. each %& indices (maybe (const True) (==) tool) %> each %& indices (matchTest versionRegex . T.unpack . prettyVer) % (viSourceDL % _Just `summing` viArch % each % each % each)) etool
-    when (null dlis) $ $(logError) [i|no tarballs selected by filter|] *> addError
-
     let gdlis = nubOrd $ gt ^.. each
-
+    let allDls = dlis ++ gdlis
-    forM_ (dlis ++ gdlis) downloadAll
+    when (null allDls) $ $(logError) [i|no tarballs selected by filter|] *> addError
+    forM_ allDls downloadAll
 
     -- exit
     e <- liftIO $ readIORef ref
@@ -254,18 +253,21 @@ validateTarballs (TarballFilter tool versionRegex) dls gt = do
 #endif
                ]
       $ do
-        case tool of
+        case etool of
-          Just GHCup -> do
+          Right (Just GHCup) -> do
-            let fn = "ghcup"
+            tmpUnpack <- lift mkGhcupTmpDir
-            p <- liftE $ download (settings appstate) dli (cacheDir dirs) (Just fn)
+            _ <- liftE $ download (settings appstate) dli tmpUnpack Nothing
-            liftE $ checkDigest (settings appstate) dli p
             pure Nothing
-          _ -> do
+          Right _ -> do
             p <- liftE $ downloadCached (settings appstate) dirs dli Nothing
             fmap (Just . head . splitDirectories . head)
               . liftE
               . getArchiveFiles
               $ p
+          Left ShimGen -> do
+            tmpUnpack <- lift mkGhcupTmpDir
+            _ <- liftE $ download (settings appstate) dli tmpUnpack Nothing
+            pure Nothing
     case r of
       VRight (Just basePath) -> do
         case _dlSubdir dli of