Skip to content

Commit

Permalink
tweak the config to get things working (may need reverting)
Browse files Browse the repository at this point in the history
  • Loading branch information
mixmix committed Nov 7, 2018
1 parent bec9209 commit e2f5bb7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
10 changes: 5 additions & 5 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ exports.create = (api) => {
const pubkey = keys.id.slice(1).replace(`.${keys.curve}`, '')

config = merge(config, {
connections: {
incoming: { unix: [{ 'scope': 'local', 'transform': 'noauth' }] }
},
keys,
remote: `unix:${Path.join(config.path, 'socket')}:~noauth:${pubkey}`
keys
// connections: {
// incoming: { unix: [{ 'scope': 'local', 'transform': 'noauth' }] }
// },
// remote: `unix:${Path.join(config.path, 'socket')}:~noauth:${pubkey}`
})
}
return config
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"patchbay-gatherings": "^3.2.8",
"patchbay-poll": "^1.1.1",
"patchbay-scry": "^1.3.1",
"patchcore": "^1.28.1",
"patchcore": "^1.28.3",
"pull-abortable": "^4.1.1",
"pull-next-query": "^1.0.0",
"pull-notify": "^0.1.1",
Expand Down
6 changes: 4 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@ const electron = require('electron')

// Get config options from depject
const config = require('./config').create().config.sync.load()
const startFrontend = () => electron.ipcRenderer.send('server-started')

Client(config.keys, config, (err, server) => {
if (err) { // no server currently running
console.log('> scuttle-shell: starting')
scuttleshell.start({}, (startErr) => {
if (startErr) return console.error('> scuttle-shell: failed to start', startErr)

electron.ipcRenderer.send('server-started')
startFrontend()
})
} else {
console.log('> scuttle-shell / sbot already running')
electron.ipcRenderer.send('server-started')
server.close() // close this connection (app starts one of its own)

startFrontend()
}
})

0 comments on commit e2f5bb7

Please sign in to comment.