Skip to content

Commit 6dd0126

Browse files
author
John McCambridge
committed
Remove compareVersions call, simplify version checking
1 parent 573ece3 commit 6dd0126

File tree

1 file changed

+5
-39
lines changed

1 file changed

+5
-39
lines changed

packages/server/src/cli.ts

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as os from "os";
88
import * as path from "path";
99
import * as WebSocket from "ws";
1010
import { buildDir, cacheHome, dataHome, isCli, serveStatic } from "./constants";
11-
import { getRecentRelease, compareVersions } from "./updater";
11+
import { getRecentRelease } from "./updater";
1212
import { createApp } from "./server";
1313
import { forkModule, requireModule } from "./vscode/bootstrapFork";
1414
import { SharedProcess, SharedProcessState } from "./vscode/sharedProcess";
@@ -166,50 +166,16 @@ const bold = (text: string | number): string | number => {
166166
}
167167
}
168168

169-
let newestVersion = "";
170-
if (process.env.VERSION) {
169+
if (isCli) {
171170
let currentVersion = process.env.VERSION;
172171
const recentRelease = await getRecentRelease();
173172

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`);
178175
}
179176
}
180-
const isDev = process.env.NODE_ENV !== "production";
181-
if (newestVersion === process.env.VERSION || isDev) {
182-
logger.info("You are using the latest version");
183-
} else {
184-
logger.warn(`New version (\u001B[1m${newestVersion}) available https://github.com/codercom/code-server/releases`);
185-
}
186-
logger.info(`\u001B[1mcode-server ${process.env.VERSION ? `v${process.env.VERSION}` : "development"}`);
187-
188-
if (options.dataDir) {
189-
logger.warn('"--data-dir" is deprecated. Use "--user-data-dir" instead.');
190-
}
191-
192-
if (options.installExtension) {
193-
const fork = forkModule("vs/code/node/cli", [
194-
"--user-data-dir", dataDir,
195-
"--builtin-extensions-dir", builtInExtensionsDir,
196-
"--extensions-dir", extensionsDir,
197-
"--install-extension", options.installExtension,
198-
], {
199-
env: {
200-
VSCODE_ALLOW_IO: "true",
201-
VSCODE_LOGS: process.env.VSCODE_LOGS,
202-
},
203-
}, dataDir);
204-
205-
fork.stdout.on("data", (d: Buffer) => d.toString().split("\n").forEach((l) => logger.info(l)));
206-
fork.stderr.on("data", (d: Buffer) => d.toString().split("\n").forEach((l) => logger.error(l)));
207-
fork.on("exit", () => process.exit());
208-
209-
return;
210-
}
211-
212177
// TODO: fill in appropriate doc url
178+
logger.info(`\u001B[1mcode-server ${process.env.VERSION ? `v${process.env.VERSION}` : "development"}`);
213179
logger.info("Additional documentation: http://github.com/codercom/code-server");
214180
logger.info("Initializing", field("data-dir", dataDir), field("extensions-dir", extensionsDir), field("working-dir", workingDir), field("log-dir", logDir));
215181
const sharedProcess = new SharedProcess(dataDir, extensionsDir, builtInExtensionsDir);

0 commit comments

Comments
 (0)