Fix packaging

Author: seanvm

package.json

@@ -2,7 +2,7 @@
   "name": "electron-react-s3-tool",
   "version": "0.1.0",
   "private": true,
-  "main": "electron.js",
+  "main": "public/electron.js",
   "homepage": "./",
   "dependencies": {
     "async-child-process": "^1.1.1",
@@ -28,6 +28,7 @@
     "eslint-plugin-react": "7.4.0",
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.5",
+    "fix-path": "^2.1.0",
     "fs-extra": "3.0.1",
     "html-webpack-plugin": "2.29.0",
     "jest": "20.0.4",
@@ -52,7 +53,7 @@
     "dev": "nf start",
     "dist": "build",
     "electron": "electron .",
-    "package": "npm run react-build && build --publish never",
+    "package": "npm run react-build && build --em.main=build/electron.js --publish never",
     "react-build": "node scripts/build.js",
     "start": "node scripts/start.js",
     "test": "node scripts/test.js --env=jsdom"
@@ -107,6 +108,10 @@
   },
   "build": {
     "appId": "yourappid",
+    "files": [
+      "build/**/*",
+      "node_modules/**/*"
+    ],
     "dmg": {
       "contents": [
         {

electron.js public/electron.jselectron.js renamed to public/electron.js

@@ -26,7 +26,7 @@ app.on('ready', function() {
     });
 
     // For debugging
-    mainWindow.webContents.openDevTools();
+    // mainWindow.webContents.openDevTools();
 
     const startUrl = process.env.ELECTRON_START_URL || url.format({
       pathname: path.join(__dirname, '/../build/index.html'),

src/App.js

@@ -6,6 +6,7 @@ import './App.css';
 
 const remote = window.require('electron').remote;
 const execAsync = window.require('async-child-process').execAsync;
+const fixPath = window.require('fix-path');
 
 class App extends Component {
   constructor(props) {
@@ -33,8 +34,10 @@ class App extends Component {
   }
 
   downloadBucket() {
+    fixPath();
     return execAsync(`aws s3 sync s3://${this.state.selectedBucket} ${this.state.downloadDirectory}`).then(results => {
-      console.log(results);  
+      console.log(results); 
+      // TODO: Killing the app should kill this process
       // return results.stdout;
     });
   }

src/components/BucketSelector.js

@@ -3,6 +3,7 @@ import { Button, Form, FormGroup, Label, Input, FormText } from 'reactstrap';
 // import { PropagateLoader } from 'react-spinners';
 
 const execAsync = window.require('async-child-process').execAsync;
+const fixPath = window.require('fix-path');
 
 class BucketSelector extends Component {
   constructor(props) {
@@ -22,6 +23,7 @@ class BucketSelector extends Component {
   } 
 
   getBuckets() {
+    fixPath();
     return execAsync("aws s3 ls").then(results => {
       return this.parseBuckets(results.stdout);
     });
@@ -50,7 +52,7 @@ class BucketSelector extends Component {
         <FormGroup>
           <Label for="exampleSelect">Select A Bucket</Label>
           <Input type="select" name="select" id="exampleSelect" onChange={this.handleBucketChange}>
-            <option value="" disabled selected>{this.state.loading ? 'Loading' : 'Select an S3 bucket'}</option>
+            <option value="" disabled selected>{this.state.loading ? 'Loading...' : 'Select an S3 bucket'}</option>
             {bucketOptions}
           </Input>
         </FormGroup>