Fix updater

src/main/paths.ts

@@ -13,25 +13,37 @@ export const appResourcesPath = (): string => {
   return resourcesPath
 }
 
+export const platform = (): NodeJS.Platform => {
+  let platform = os.platform()
+  if (process.env.KEYS_PLATFORM) {
+    platform = process.env.KEYS_PLATFORM as NodeJS.Platform
+  }
+  return platform
+}
+
 export const appSupportPath = (): string => {
-  const appName: string = getAppName()
+  const appName = getAppName()
   let supportDir
-  if (os.platform() == 'linux') {
-    if (process.env.XDG_DATA_HOME) {
-      supportDir = process.env.XDG_DATA_HOME
-    } else {
-      const homeDir = os.homedir()
-      supportDir = path.join(homeDir, '.local', 'share')
-    }
-  } else if (os.platform() == 'win32') {
-    if (process.env.LOCALAPPDATA) {
-      supportDir = process.env.LOCALAPPDATA
-    } else {
-      const homeDir = os.homedir()
-      supportDir = path.join(homeDir, 'AppData', 'Roaming')
-    }
-  } else {
-    supportDir = app.getPath('appData')
+  switch (platform()) {
+    case 'linux':
+      if (process.env.XDG_DATA_HOME) {
+        supportDir = process.env.XDG_DATA_HOME
+      } else {
+        const homeDir = os.homedir()
+        supportDir = path.join(homeDir, '.local', 'share')
+      }
+      break
+    case 'win32':
+      if (process.env.LOCALAPPDATA) {
+        supportDir = process.env.LOCALAPPDATA
+      } else {
+        const homeDir = os.homedir()
+        supportDir = path.join(homeDir, 'AppData', 'Roaming')
+      }
+      break
+    default:
+      supportDir = app.getPath('appData')
+      break
   }
 
   const p = path.join(supportDir, appName)
@@ -60,7 +72,7 @@ export const appPath = (): string => {
 // Path to an executable
 export const binPath = (name: string): string => {
   const resourcesPath = appResourcesPath()
-  if (os.platform() == 'win32') {
+  if (platform() == 'win32') {
     name = name + '.exe'
   }
   return path.join(resourcesPath, 'bin', name)

src/main/updater.ts

@@ -4,7 +4,7 @@ import {app} from 'electron'
 import {appPath, appSupportPath} from './paths'
 import * as fs from 'fs'
 import * as path from 'path'
-import * as os from 'os'
+import {platform} from './paths'
 import {keysStop} from './service'
 import ElectronStore from 'electron-store'
 
@@ -77,7 +77,7 @@ export const update = (version: string, apply: boolean): Promise<UpdateResult> =
       console.log('Apply:', applyPath)
       relaunch = true
 
-      if (os.platform() == 'win32') {
+      if (platform() == 'win32') {
         // Copy updater to support path, so we can update over the installed version.
         const updaterDest = path.join(appSupportPath(), 'updater.exe')
         if (fs.existsSync(updaterDest)) {

src/renderer/env.ts

@@ -0,0 +1,9 @@
+import * as os from 'os'
+
+export const platform = (): NodeJS.Platform => {
+  let platform = os.platform()
+  if (process.env.KEYS_PLATFORM) {
+    platform = process.env.KEYS_PLATFORM as NodeJS.Platform
+  }
+  return platform
+}

src/renderer/views/root.tsx

@@ -164,6 +164,7 @@ export default (_: {}) => {
       <Router hook={useHashLocation}>
         <Root />
         <Errors />
+        <UpdateAlert />
       </Router>
     </ThemeProvider>
   )

src/renderer/views/update/alert.tsx

@@ -5,9 +5,9 @@ import {Box, Snackbar, Typography} from '@material-ui/core'
 import {Link} from '../../components'
 
 import Alert from '@material-ui/lab/Alert'
-
+import {platform} from '../../env'
 import {store} from '../../store'
-import {ipcRenderer} from 'electron'
+import {ipcRenderer, shell} from 'electron'
 
 export default (props: {}) => {
   const setUpdating = () => {
@@ -34,6 +34,7 @@ class UpdateAlert extends React.Component<Props, State> {
   }
 
   componentDidMount() {
+    console.log('UpdateAlert mount')
     ipcRenderer.on('update-needed', (event, update) => {
       console.log('Update:', update)
       if (update.needUpdate) {
@@ -56,6 +57,7 @@ class UpdateAlert extends React.Component<Props, State> {
   }
 
   componentWillUnmount() {
+    console.log('UpdateAlert unmount')
     ipcRenderer.removeAllListeners('update-needed')
     ipcRenderer.removeAllListeners('update-check-err')
     ipcRenderer.removeAllListeners('update-apply-err')
@@ -77,35 +79,60 @@ class UpdateAlert extends React.Component<Props, State> {
     this.props.setUpdating()
   }
 
+  openReleases = () => {
+    shell.openExternal('https://github.com/keys-pub/app/releases')
+  }
+
   render() {
+    let action
+    let actionLabel
+
+    switch (platform()) {
+      case 'darwin':
+        action = this.apply
+        actionLabel = 'Download & Restart'
+        break
+      case 'win32':
+        action = this.apply
+        actionLabel = 'Download & Restart'
+        break
+      default:
+        action = this.openReleases
+        actionLabel = 'View Releases'
+        break
+    }
+
     return (
       <UpdateAlertView
         open={this.state.open}
         close={this.close}
         version={this.state.version}
-        apply={this.apply}
+        action={action}
+        actionLabel={actionLabel}
       />
     )
   }
 }
 
-const UpdateAlertView = (props: {open: boolean; close: () => void; version: string; apply: () => void}) => {
+type UpdateAlertProps = {
+  open: boolean
+  version: string
+  close: () => void
+  action: () => void
+  actionLabel: string
+}
+
+const UpdateAlertView = (props: UpdateAlertProps) => {
   return (
     <Snackbar
       open={props.open}
       onClose={() => {}} // Alert must be closed manually (not via clickaway or timeout)
       anchorOrigin={{vertical: 'bottom', horizontal: 'left'}}
     >
-      <Alert
-        onClose={props.close}
-        severity="info"
-        elevation={3}
-        // variant="filled"
-        style={{paddingTop: 5, paddingBottom: 3}}
-      >
+      <Alert onClose={props.close} severity="info" elevation={3} style={{paddingTop: 5, paddingBottom: 3}}>
         <Box>
           <Typography>There is a an update available ({props.version}).</Typography>
-          <Link onClick={props.apply}>Download &amp; Restart</Link>
+          <Link onClick={props.action}>{props.actionLabel}</Link>
         </Box>
       </Alert>
     </Snackbar>