rename all references from services to packages

This commit is contained in:
Lucy Cifferello
2021-11-22 13:06:05 -07:00
committed by Keagan McClelland
parent 94a1c66f6c
commit b0453e1d4a
4 changed files with 148 additions and 138 deletions

View File

@@ -37,7 +37,7 @@ import qualified Data.Text as T
import Lib.Error ( S9Error(NotFoundE) )
import qualified Lib.External.AppMgr as AppMgr
import Lib.Types.AppIndex ( PkgId(..)
, ServiceManifest(serviceManifestIcon)
, PackageManifest(packageManifestIcon)
)
import Lib.Types.Emver ( Version
, VersionRange
@@ -163,7 +163,7 @@ extractPkg fp = handle @_ @SomeException cleanup $ do
liftIO . throwIO $ ManifestParseException (pkgRoot </> "manifest.json")
Right manifest -> do
wait iconTask
let iconDest = "icon" <.> case serviceManifestIcon manifest of
let iconDest = "icon" <.> case packageManifestIcon manifest of
Nothing -> "png"
Just x -> case takeExtension (T.unpack x) of
"" -> "png"