Merge pull request #208 from SuperNETorg/electrum

Electrum

gui/startup/app-settings.html

@@ -36,6 +36,7 @@
         <div
           id="debugOverlay"
           class="debug-overlay hide"></div>
+        <div class="padding-top-40">Any changes to app config require app restart!</div>
         <div class="settings-buttons-block">
           <button
             onClick="testBins('komodod')"

main.js

@@ -308,7 +308,7 @@ function createAppSettingsWindow() {
 	// initialise window
 	appSettingsWindow = new BrowserWindow({ // dirty hack to prevent main window flash on quit
 		width: 750,
-		height: 570,
+		height: 610,
 		frame: false,
 		icon: agamaIcon,
 		show: false,

make-deb.js

@@ -0,0 +1,26 @@
+// prequsites: https://www.npmjs.com/package/electron-installer-debian
+
+var installer = require('electron-installer-debian');
+
+var options = {
+  src: 'build/Agama-linux-x64/',
+  dest: 'build/',
+  arch: 'amd64',
+  icon: 'assets/icons/agama_icons/64x64.png',
+  name: 'agama-app',
+  bin: 'Agama',
+  categories: ['Office', 'Internet'],
+  homepage: 'http://supernet.org',
+  maintainer: 'SuperNET <dev@supernet.org>',
+}
+
+console.log('Creating package (this may take a while)');
+
+installer(options, function (err) {
+  if (err) {
+    console.error(err, err.stack);
+    process.exit(1);
+  }
+
+  console.log('Successfully created package at ' + options.dest);
+});

make-rpm.js

@@ -0,0 +1,26 @@
+// prequsites: https://www.npmjs.com/package/electron-installer-redhat
+
+var installer = require('electron-installer-redhat');
+
+var options = {
+  src: 'build/Agama-linux-x64/',
+  dest: 'build/',
+  arch: 'x86_64',
+  icon: 'assets/icons/agama_icons/64x64.png',
+  name: 'agama-app',
+  bin: 'Agama',
+  categories: ['Office', 'Internet'],
+  homepage: 'http://supernet.org',
+  maintainer: 'SuperNET <dev@supernet.org>',
+};
+
+console.log('Creating package (this may take a while)');
+
+installer(options, function (err) {
+  if (err) {
+    console.error(err, err.stack);
+    process.exit(1);
+  }
+
+  console.log('Successfully created package at ' + options.dest);
+});

package.json

@@ -1,14 +1,17 @@
 {
-  "name": "agama_app",
+  "name": "agama-app",
   "productName": "Agama",
   "version": "0.2.23",
-  "description": "Agama Desktop App",
+  "description": "Agama Wallet Desktop App",
   "main": "main.js",
   "scripts": {
     "start": "electron .",
-    "make-patch": "./make-patch.sh"
+    "make-patch": "./make-patch.sh",
+    "make-rpm": "node make-rpm.js",
+    "make-deb": "node make-deb.js"
   },
   "repository": "https://github.com/SuperNETorg/Agama/",
+  "homepage": "http://supernet.org",
   "keywords": [
     "agama",
     "SuperNET",
@@ -18,7 +21,9 @@
   "author": "SuperNET",
   "license": "MIT",
   "devDependencies": {
-    "electron": "^1.4.1"
+    "electron": "^1.4.1",
+    "electron-installer-debian": "^0.6.0",
+    "electron-installer-redhat": "^0.5.0"
   },
   "dependencies": {
     "adm-zip": "^0.4.7",

routes/shepherd.js

@@ -52,10 +52,12 @@ shepherd.CONNECTION_ERROR_OR_INCOMPLETE_DATA = 'connection error or incomplete d
 
 shepherd.appConfig = shepherd._appConfig.config;
 
+// core
 shepherd = require('./shepherd/paths.js')(shepherd);
 
 shepherd.pathsAgama();
 
+// core
 shepherd = require('./shepherd/log.js')(shepherd);
 shepherd = require('./shepherd/config.js')(shepherd);
 
@@ -84,6 +86,7 @@ shepherd = require('./shepherd/electrum/estimate.js')(shepherd);
 // dex
 shepherd = require('./shepherd/dex/coind.js')(shepherd);
 
+// core
 shepherd = require('./shepherd/addCoinShortcuts.js')(shepherd);
 shepherd = require('./shepherd/dashboardUpdate.js')(shepherd);
 shepherd = require('./shepherd/binsTestUtil.js')(shepherd);

routes/shepherd/binsTestUtil.js

@@ -214,7 +214,7 @@ module.exports = (shepherd) => {
   // komodod datadir location test
   shepherd.testLocation = (path) => {
     return new shepherd.Promise((resolve, reject) => {
-      if (shepherd.path.indexOf(' ') > -1) {
+      if (path.indexOf(' ') > -1) {
         shepherd.log(`error testing path ${path}`);
         resolve(-1);
       } else {