From f40c8cf916d6ce7af2c376b39990612de752d981 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Fri, 2 Jul 2021 18:43:40 -0400 Subject: [PATCH] fix path to version and remove json flag from sdk manifest cmd --- src/Handler/Marketplace.hs | 2 +- src/Lib/External/AppMgr.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Marketplace.hs b/src/Handler/Marketplace.hs index 5232dfc..1750f1f 100644 --- a/src/Handler/Marketplace.hs +++ b/src/Handler/Marketplace.hs @@ -189,7 +189,7 @@ getServiceR = do categories <- runDB $ fetchAppCategories (entityKey service) (appsDir, appMgrDir) <- getsYesod $ (( "apps") . resourcesDir &&& staticBinDir) . appSettings let appId = sAppAppId $ entityVal service - let appDir = (<> "/") . ( show version) . ( toS appId) $ appsDir + let appDir = (<> "/") . ( show (sVersionNumber $ entityVal version)) . ( toS appId) $ appsDir let appExt = Extension (toS appId) :: Extension "s9pk" $logInfo $ "*******************" <> show appDir manifest' <- handleS9ErrT $ getManifest appMgrDir appDir appExt diff --git a/src/Lib/External/AppMgr.hs b/src/Lib/External/AppMgr.hs index 2e67d15..612b98d 100644 --- a/src/Lib/External/AppMgr.hs +++ b/src/Lib/External/AppMgr.hs @@ -51,7 +51,7 @@ getConfig appmgrPath appPath e@(Extension appId) = fmap decodeUtf8 $ do getManifest :: (MonadIO m, KnownSymbol a) => FilePath -> FilePath -> Extension a -> S9ErrT m ByteString getManifest appmgrPath appPath e@(Extension appId) = do - (ec, bs) <- readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "manifest", appPath <> show e, "--json"] "" + (ec, bs) <- readProcessInheritStderr (appmgrPath <> "embassy-sdk") ["inspect", "manifest", appPath <> show e] "" case ec of ExitSuccess -> pure bs ExitFailure n -> throwE $ AppMgrE [i|info manifest #{appId} \--json|] n