fix(electron-updater): channel & channelFile mismatch for macOS GenericProvider publishing (#1203) (#1206)

Markus Müller · develar · commit f23daff7ce8e · 2017-02-02T17:56:25.000+01:00
diff --git a/packages/electron-updater/src/GenericProvider.ts b/packages/electron-updater/src/GenericProvider.ts
@@ -1,4 +1,4 @@
-import { Provider, FileInfo, getDefaultChannelName, getChannelFilename, getCurrentPlatform } from "./api"
+import { Provider, FileInfo, getDefaultChannelName, getCustomChannelName, getChannelFilename, getCurrentPlatform } from "./api"
 import { GenericServerOptions, UpdateInfo } from "electron-builder-http/out/publishOptions"
 import * as url from "url"
 import * as path from "path"
@@ -7,7 +7,7 @@ import { HttpError, request } from "electron-builder-http"
 
 export class GenericProvider extends Provider<UpdateInfo> {
   private readonly baseUrl = url.parse(this.configuration.url)
-  private readonly channel = this.configuration.channel || getDefaultChannelName()
+  private readonly channel = this.configuration.channel ? getCustomChannelName(this.configuration.channel) : getDefaultChannelName()
 
   constructor(private readonly configuration: GenericServerOptions) {
     super()
diff --git a/packages/electron-updater/src/api.ts b/packages/electron-updater/src/api.ts
@@ -30,6 +30,10 @@ export function getDefaultChannelName() {
   return channel
 }
 
+export function getCustomChannelName(channel: string) {
+  return `${channel}${(getCurrentPlatform()) === "darwin" ? "-mac" : ""}`
+}
+
 export function getCurrentPlatform () {
   return process.env.TEST_UPDATER_PLATFORM || process.platform
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ export function getDefaultChannelName() {`
`30`	`30`	`return channel`
`31`	`31`	`}`
`32`	`32`
	`33`	`+export function getCustomChannelName(channel: string) {`
	`34`	+ return `${channel}${(getCurrentPlatform()) === "darwin" ? "-mac" : ""}`
	`35`	`+}`
	`36`	`+`
`33`	`37`	`export function getCurrentPlatform () {`
`34`	`38`	`return process.env.TEST_UPDATER_PLATFORM \|\| process.platform`
`35`	`39`	`}`