fix: Trim suffix from wine version (#1033)

Closes #1031 #953
electron-userland · Dec 21, 2016 · 090150c · 090150c
1 parent 0ce1a3c
commit 090150c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/packager.ts b/src/packager.ts
@@ -320,6 +320,11 @@ export async function checkWineVersion(checkPromise: Promise<string>) {
     wineVersion = wineVersion.substring(0, spaceIndex)
   }
 
+  const suffixIndex = wineVersion.indexOf("-")
+  if (suffixIndex > 0) {
+    wineVersion = wineVersion.substring(0, suffixIndex)
+  }
+
   if (wineVersion.split(".").length === 2) {
     wineVersion += ".0"
   }

diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts
@@ -213,10 +213,11 @@ test.ifDevOrLinuxCi("smart unpack", () => {
 
 test("wine version", async () => {
   await checkWineVersion(BluebirdPromise.resolve("1.9.23 (Staging)"))
+  await checkWineVersion(BluebirdPromise.resolve("2.0-rc2"))
 })
 
 function currentPlatform(): PackagerOptions {
   return {
     targets: Platform.fromString(process.platform).createTarget(DIR_TARGET),
   }
-}
+}