Merge pull request #4 from lightninglabs/apps-dir

Apps Dir

Author: casesandberg

packages/lightning-desktop/app.dev.html apps/desktop/app.dev.htmlpackages/lightning-desktop/app.dev.html renamed to apps/desktop/app.dev.html

@@ -9,7 +9,7 @@ import cp from 'child_process'
 import ps from 'ps-node'
 import fileLog from 'electron-log'
 import os from 'os'
-import lnd from './lnd'
+import lnd from './rpc-server'
 
 global.connection = lnd.connection
 global.serverReady = lnd.serverReady
@@ -40,11 +40,10 @@ const runProcesses = (processes, logs) => {
       })
       .catch(() => {
         const plat = os.platform()
-        const binPath = isDev ? '../lightning-desktop/bin' : 'bin'
-        const filePath = path.join(__dirname, binPath, plat, proc.name, plat === 'win32' ? '.exe' : '')
+        const filePath = path.join(__dirname, 'bin', plat, proc.name, plat === 'win32' ? '.exe' : '')
 
         try {
-          const instance = cp.execFile(filePath, proc.args, { cwd: binPath }, (error) => {
+          const instance = cp.execFile(filePath, proc.args, { cwd: 'bin' }, (error) => {
             if (error) {
               logs.push(error.code ? `${ error.code }: ${ error.errno }` : JSON.stringify(error))
             }
@@ -65,7 +64,6 @@ const runProcesses = (processes, logs) => {
 
 const logBuffer = []
 const logs = observe(logBuffer)
-const miningaddr = isDev ? '--miningaddr=4NyWssGkW6Nbwj3nXrJU54U2ijHgWaKZ1N19w' : ''
 
 const processes = [
   {
@@ -85,7 +83,7 @@ const processes = [
       '--rpcuser=kek',
       '--rpcpass=kek',
       isDev ? '--simnet' : '--testnet',
-      miningaddr,
+      isDev ? '--miningaddr=4NyWssGkW6Nbwj3nXrJU54U2ijHgWaKZ1N19w' : '',
       '--txindex',
     ],
   },

packages/lightning-desktop/app.html apps/desktop/app.htmlpackages/lightning-desktop/app.html renamed to apps/desktop/app.html

@@ -8,11 +8,11 @@
     "node": "^6.7.0"
   },
   "scripts": {
-    "package": "cross-env NODE_ENV=production node -r babel-register -r babel-polyfill package.js",
+    "package": "cross-env NODE_ENV=production node -r babel-register -r babel-polyfill scripts/package.js",
     "package-all": "npm run package -- --all",
-    "start": "node startup-message.js && concurrently --kill-others \"npm run start-electron\" \"npm run start-webpack\" -n \"electron,webpack\" -p name",
-    "start-electron": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./main.development",
-    "start-webpack": "cross-env NODE_ENV=development node -r babel-register dev-server.js",
+    "start": "node scripts/startup-message.js && concurrently --kill-others \"npm run start-electron\" \"npm run start-webpack\" -n \"electron,webpack\" -p name",
+    "start-electron": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./main.dev",
+    "start-webpack": "cross-env NODE_ENV=development node -r babel-register scripts/dev-server.js",
     "install-grpc": "cd node_modules/grpc && git submodule update --init && npm run electron-build -- --target=1.4.6"
   },
   "bin": {