Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
heronhaye committed Apr 16, 2019
1 parent 3f3b93c commit 9869e61
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions go/install/stop_darwin.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright 2019 Keybase, Inc. All rights reserved. Use of
// this source code is governed by the included BSD license.

// +build darwin

package install

import (
Expand Down
5 changes: 5 additions & 0 deletions go/install/stop_windows.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Copyright 2019 Keybase, Inc. All rights reserved. Use of
// this source code is governed by the included BSD license.

// +build windows

package install

import (
Expand Down
6 changes: 1 addition & 5 deletions shared/desktop/app/ctl.desktop.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as SafeElectron from '../../util/safe-electron.desktop'
import {keybaseBinPath} from './paths.desktop'
import exec from './exec.desktop'
import {isWindows, isLinux} from '../../constants/platform'
import {isWindows} from '../../constants/platform'

export function ctlStop(callback: any) {
const binPath = keybaseBinPath()
Expand All @@ -12,10 +12,6 @@ export function ctlStop(callback: any) {
args = ['ctl', 'stop']
plat = 'win32'
}
if (isLinux) {
args = ['ctl', 'stop']
plat = 'linux'
}
exec(binPath, args, plat, 'prod', false, callback)
}

Expand Down
1 change: 0 additions & 1 deletion shared/desktop/app/paths.desktop.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export function keybaseBinPath() {
}
return path.resolve(String(kbPath), 'Keybase', 'keybase.exe')
}
if (os.platform() === 'linux') return '/usr/bin/keybase'
if (os.platform() !== 'darwin') return null
const bundlePath = appBundlePath()
if (bundlePath === null) return null
Expand Down

0 comments on commit 9869e61

Please sign in to comment.