Browse Source

Merge pull request #118 from pbca26/pkg_automation

Pkg automation
pkg_automation_electrum
pbca26 8 years ago
committed by GitHub
parent
commit
38c3b24d7d
  1. BIN
      assets/bin/linux64/iguana
  2. BIN
      assets/bin/linux64/komodo-cli
  3. BIN
      assets/bin/linux64/komodod
  4. 2
      gui/EasyDEX-GUI
  5. 6
      main.js
  6. 6
      routes/shepherd.js

BIN
assets/bin/linux64/iguana

Binary file not shown.

BIN
assets/bin/linux64/komodo-cli

Binary file not shown.

BIN
assets/bin/linux64/komodod

Binary file not shown.

2
gui/EasyDEX-GUI

@ -1 +1 @@
Subproject commit d48b6500f4eff5e9a1d55490d11e5f1502f647af Subproject commit 490ddb48a4472dfd9abf8792674a83688fdae0d3

6
main.js

@ -29,7 +29,7 @@ Promise = require('bluebird');
const appBasicInfo = { const appBasicInfo = {
name: 'Agama', name: 'Agama',
version: '0.1.7.77a-beta' version: '0.2.0.1a-beta'
}; };
app.setName(appBasicInfo.name); app.setName(appBasicInfo.name);
@ -365,10 +365,10 @@ function createWindow (status) {
if (appConfig.edexGuiOnly) { if (appConfig.edexGuiOnly) {
if (appConfig.v2) { if (appConfig.v2) {
shepherd.writeLog('show edex gui'); shepherd.writeLog('show edex gui');
mainWindow.loadURL('http://127.0.0.1:3000'); // mainWindow.loadURL('http://127.0.0.1:3000');
mainWindow.appConfig = appConfig; mainWindow.appConfig = appConfig;
mainWindow.appSessionHash = appSessionHash; mainWindow.appSessionHash = appSessionHash;
//mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/react/build'); mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/react/build');
} else { } else {
shepherd.writeLog('show edex gui'); shepherd.writeLog('show edex gui');
mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/'); mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/');

6
routes/shepherd.js

@ -51,12 +51,12 @@ if (os.platform() === 'darwin') {
} }
if (os.platform() === 'linux') { if (os.platform() === 'linux') {
var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux64/iguana'), var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/iguana'),
iguanaDir = process.env.HOME + '/.iguana', iguanaDir = process.env.HOME + '/.iguana',
iguanaConfsDir = iguanaDir + '/confs', iguanaConfsDir = iguanaDir + '/confs',
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'), iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'),
komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux64/komodod'), komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/komodod'),
komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux64/komodo-cli'), komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/komodo-cli'),
komodoDir = process.env.HOME + '/.komodo'; komodoDir = process.env.HOME + '/.komodo';
} }

Loading…
Cancel
Save