@@ -558,6 +558,7 @@ export function setupRoutes(): express.Router {
558558
559559 router . get ( '/ready' , ( req : express . Request , res : express . Response ) => {
560560 Observable . merge ( ...[
561+ system . isGitInstalled ( ) ,
561562 system . isSQLiteInstalled ( ) ,
562563 docker . isDockerInstalled ( ) ,
563564 docker . isDockerRunning ( ) ,
@@ -588,18 +589,24 @@ export function setupRoutes(): express.Router {
588589 } ) ;
589590
590591 router . get ( '/status' , ( req : express . Request , res : express . Response ) => {
591- system . isSQLiteInstalled ( ) . subscribe ( sqlite => {
592- docker . isDockerInstalled ( ) . subscribe ( dockerInstalled => {
593- if ( dockerInstalled ) {
594- docker . isDockerRunning ( ) . subscribe ( dockerRunning => {
595- const data = { sqlite : sqlite , docker : dockerInstalled , dockerRunning : dockerRunning } ;
596- res . status ( 200 ) . json ( { data : data } ) ;
597- } ) ;
598- } else {
599- const data = { sqlite : sqlite , docker : false , dockerRunning : false } ;
600- res . status ( 200 ) . json ( { data : data } ) ;
601- }
602- } ) ;
592+ Observable . concat ( ...[
593+ system . isGitInstalled ( ) ,
594+ system . isSQLiteInstalled ( ) ,
595+ docker . isDockerInstalled ( )
596+ ] )
597+ . toArray ( )
598+ . subscribe ( data => {
599+ if ( data [ 2 ] ) {
600+ docker . isDockerRunning ( ) . subscribe ( dockerRunning => {
601+ const status = {
602+ sqlite : data [ 1 ] , docker : data [ 2 ] , dockerRunning : dockerRunning , git : data [ 0 ] } ;
603+ res . status ( 200 ) . json ( { data : status } ) ;
604+ } ) ;
605+ } else {
606+ const status = {
607+ sqlite : data [ 1 ] , docker : false , dockerRunning : false , git : data [ 0 ] } ;
608+ res . status ( 200 ) . json ( { data : status } ) ;
609+ }
603610 } ) ;
604611 } ) ;
605612
0 commit comments