From ca4b0346cb94f5ecad53c7e493e4dae33a7e822f Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@kwc.io>
Date: Tue, 26 Mar 2019 14:38:38 -0400
Subject: [PATCH] Update versioning format

---
 .travis.yml    | 4 +++-
 build/tasks.ts | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5d2aee28..47aef9c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: node_js
 node_js:
 - 8.15.0
 env:
-  - VERSION="1.32.0-$TRAVIS_BUILD_NUMBER"
+  - VSCODE_VERSION="1.32.0"
+  - MAJOR_VERSION="1"
+  - VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
 matrix:
   include:
   - os: linux
diff --git a/build/tasks.ts b/build/tasks.ts
index f526d6b8..a784fbf5 100644
--- a/build/tasks.ts
+++ b/build/tasks.ts
@@ -10,7 +10,7 @@ const libPath = path.join(__dirname, "../lib");
 const vscodePath = path.join(libPath, "vscode");
 const pkgsPath = path.join(__dirname, "../packages");
 const defaultExtensionsPath = path.join(libPath, "VSCode-linux-x64/resources/app/extensions");
-const vscodeVersion = "1.32.0";
+const vscodeVersion = process.env.VSCODE_VERSION || "1.32.0";
 
 const buildServerBinary = register("build:server:binary", async (runner) => {
 	await ensureInstalled();
@@ -236,7 +236,7 @@ register("package", async (runner, releaseTag) => {
 
 	const releasePath = path.resolve(__dirname, "../release");
 
-	const archiveName = `code-server-${releaseTag}-${os.platform()}-${os.arch()}`;
+	const archiveName = `code-server${releaseTag}-${os.platform()}-${os.arch()}`;
 	const archiveDir = path.join(releasePath, archiveName);
 	fse.removeSync(archiveDir);
 	fse.mkdirpSync(archiveDir);