Commit176d24a

committed

have git use version fn

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent21a0ff0 commit176d24aCopy full SHA for 176d24a

File tree

-15

lines changed

-15

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import tutorialConfig from '../actions/tutorialConfig'`
`9`	`9`	`import{COMMANDS}from'../editor/commands'`
`10`	`10`	`importloggerfrom'../services/logger'`
`11`	`11`	`importContextfrom'./context'`
`12`		`-import{versionasgitVersion}from'../services/git'`
	`12`	`+import{version}from'../services/dependencies'`
`13`	`13`	`import{openWorkspace,checkWorkspaceEmpty}from'../services/workspace'`
`14`	`14`	`import{readFile}from'fs'`
`15`	`15`	`import{join}from'path'`
`@@ -146,7 +146,7 @@ class Channel implements Channel {`
`146`	`146`	`}`
`147`	`147`	`// 2. check Git is installed.`
`148`	`148`	`// Should wait for workspace before running otherwise requires access to root folder`
`149`		`-constisGitInstalled=awaitgitVersion()`
	`149`	`+constisGitInstalled=awaitversion('git')`
`150`	`150`	`if(!isGitInstalled){`
`151`	`151`	`consterror:E.ErrorMessage={`
`152`	`152`	`type:'GitNotFound',`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,19 +69,6 @@ export async function clear(): Promise<Error \| void> {`
`69`	`69`	`thrownewError('Error cleaning up current unsaved work')`
`70`	`70`	`}`
`71`	`71`
`72`		`-exportasyncfunctionversion():Promise<string\|null>{`
`73`		`-const{ stdout, stderr}=awaitnode.exec('git --version')`
`74`		`-if(!stderr){`
`75`		`-constmatch=stdout.match(/^gitversion(\d+\.)?(\d+\.)?(\*\|\d+)/)`
`76`		`-if(match){`
`77`		`-// eslint-disable-next-line`
`78`		`-const[_,major,minor,patch]=match`
`79`		-return`${major}${minor}${patch}`
`80`		`-}`
`81`		`-}`
`82`		`-returnnull`
`83`		`-}`
`84`		`-`
`85`	`72`	`asyncfunctioninit():Promise<Error\|void>{`
`86`	`73`	`const{ stderr}=awaitnode.exec('git init')`
`87`	`74`	`if(stderr){`

Comments

(0)