Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-30 11:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from Start9Labs/bugfix/icon-destinations

Browse Source 
creates correct icon file
This commit is contained in:
Lucy C
2021-09-29 17:05:54 -06:00
committed by GitHub
parent d5f7f32ea2 cd75af0ab2
commit 31f4e7e158
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Lib/PkgRepository.hs
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