Remove compareVersions call, simplify version checking

John McCambridge · John McCambridge · commit e82604fc1e22 · 2019-04-17T18:02:28.000-05:00
diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
@@ -166,15 +166,12 @@ const bold = (text: string | number): string | number => {
 		}
 	}
 
-	let newestVersion = "";
-	if (process.env.VERSION) {
+	if (isCli) {
 		let currentVersion = process.env.VERSION;
 		const recentRelease = await getRecentRelease();
 
-		if (compareVersions(currentVersion, recentRelease)! <= 1) {
-			newestVersion = recentRelease;
-		} else {
-			newestVersion = currentVersion;
+		if (recentRelease !== currentVersion) {
+			logger.warn(`New version (\u001B[1m${recentRelease}\u001B[0m) available https://github.com/codercom/code-server/releases/latest`);
 		}
 	}
 	const isDev = process.env.NODE_ENV !== "production";
@@ -210,6 +207,7 @@ const bold = (text: string | number): string | number => {
 	}
 
 	// TODO: fill in appropriate doc url
+	logger.info(`\u001B[1mcode-server ${process.env.VERSION ? `v${process.env.VERSION}` : "development"}`);
 	logger.info("Additional documentation: http://github.com/codercom/code-server");
 	logger.info("Initializing", field("data-dir", dataDir), field("extensions-dir", extensionsDir), field("working-dir", workingDir), field("log-dir", logDir));
 	const sharedProcess = new SharedProcess(dataDir, extensionsDir, builtInExtensionsDir);

Original file line number	Diff line number	Diff line change
`@@ -166,15 +166,12 @@ const bold = (text: string \| number): string \| number => {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- let newestVersion = "";`
`170`		`- if (process.env.VERSION) {`
	`169`	`+ if (isCli) {`
`171`	`170`	`let currentVersion = process.env.VERSION;`
`172`	`171`	`const recentRelease = await getRecentRelease();`
`173`	`172`
`174`		`- if (compareVersions(currentVersion, recentRelease)! <= 1) {`
`175`		`- newestVersion = recentRelease;`
`176`		`- } else {`
`177`		`- newestVersion = currentVersion;`
	`173`	`+ if (recentRelease !== currentVersion) {`
	`174`	+ logger.warn(`New version (\u001B[1m${recentRelease}\u001B[0m) available https://github.com/codercom/code-server/releases/latest`);
`178`	`175`	`}`
`179`	`176`	`}`
`180`	`177`	`const isDev = process.env.NODE_ENV !== "production";`
`@@ -210,6 +207,7 @@ const bold = (text: string \| number): string \| number => {`
`210`	`207`	`}`
`211`	`208`
`212`	`209`	`// TODO: fill in appropriate doc url`
	`210`	+ logger.info(`\u001B[1mcode-server ${process.env.VERSION ? `v${process.env.VERSION}` : "development"}`);
`213`	`211`	`logger.info("Additional documentation: http://github.com/codercom/code-server");`
`214`	`212`	`logger.info("Initializing", field("data-dir", dataDir), field("extensions-dir", extensionsDir), field("working-dir", workingDir), field("log-dir", logDir));`
`215`	`213`	`const sharedProcess = new SharedProcess(dataDir, extensionsDir, builtInExtensionsDir);`