creates correct icon file

This commit is contained in:
Keagan McClelland
2021-09-29 16:09:27 -06:00
parent d6ae703915
commit 505a51b486

View File

@@ -65,7 +65,6 @@ import Startlude ( ($)
, filter , filter
, find , find
, for_ , for_
, fromMaybe
, headMay , headMay
, not , not
, partitionEithers , partitionEithers
@@ -157,7 +156,11 @@ extractPkg fp = handle @_ @SomeException cleanup $ do
liftIO . throwIO $ ManifestParseException (pkgRoot </> "manifest.json") liftIO . throwIO $ ManifestParseException (pkgRoot </> "manifest.json")
Right manifest -> do Right manifest -> do
wait iconTask wait iconTask
let iconDest = "icon" <.> T.unpack (fromMaybe "png" (serviceManifestIcon manifest)) let iconDest = "icon" <.> case serviceManifestIcon manifest of
Nothing -> "png"
Just x -> case takeExtension (T.unpack x) of
"" -> "png"
other -> other
liftIO $ renameFile (pkgRoot </> "icon.tmp") (pkgRoot </> iconDest) liftIO $ renameFile (pkgRoot </> "icon.tmp") (pkgRoot </> iconDest)
hash <- wait pkgHashTask hash <- wait pkgHashTask
liftIO $ writeFile (pkgRoot </> "hash.bin") hash liftIO $ writeFile (pkgRoot </> "hash.bin") hash