From 236908993e7915419d6f1a941add1b92ca680be1 Mon Sep 17 00:00:00 2001
From: Matt <sixteenmillimeter@riseup.net>
Date: Thu, 9 Feb 2017 09:35:07 -0500
Subject: [PATCH] Update requirements

---
 app/build_mac.sh                            | 21 +++++++++++++++++++
 app/js/app.js                               |  2 +-
 app/main.js                                 |  5 ++++-
 app/package.json                            | 23 +++++++++++----------
 app/src/index.js                            |  2 +-
 ino/mcopy_light_tests/mcopy_light_tests.ino |  8 +++----
 6 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 app/build_mac.sh

diff --git a/app/build_mac.sh b/app/build_mac.sh
new file mode 100644
index 0000000..6962d98
--- /dev/null
+++ b/app/build_mac.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/css
+mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/data
+mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/fonts
+mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/js
+mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/lib
+mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/logs
+
+cp -R ./css/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/css
+cp -R ./fonts/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/fonts
+cp -R ./js/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/js
+cp -R ./lib/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/lib
+
+cp ./data/cfg.json.default ../../mcopy_build_mac/Electron.app/Contents/Resources/app/data/
+
+cp ./index.html ../../mcopy_build_mac/Electron.app/Contents/Resources/app/
+cp ./main.js ../../mcopy_build_mac/Electron.app/Contents/Resources/app/
+cp ./package.json ../../mcopy_build_mac/Electron.app/Contents/Resources/app/
+
+cd ../../mcopy_build_mac/Electron.app/Contents/Resources/app/ && npm install && ./node_modules/.bin/electron-rebuild
\ No newline at end of file
diff --git a/app/js/app.js b/app/js/app.js
index 22acc1f..03cbecf 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -3041,7 +3041,7 @@ var remote = require('remote'),
 	dialog = require('electron').remote.dialog,
 	notifier = require('node-notifier'),
 	fs = require('fs'),
-	uuid = require('node-uuid'),
+	uuid = require('uuid'),
 	moment = require('moment'),
 	humanizeDuration = require('humanize-duration')
 	ipcRenderer = require('electron').ipcRenderer,
diff --git a/app/main.js b/app/main.js
index 073081c..592fa1a 100644
--- a/app/main.js
+++ b/app/main.js
@@ -1,3 +1,4 @@
+
 var electron = require('electron'),
 	fs = require('fs'),
 	Menu = require('menu'),
@@ -7,7 +8,7 @@ var electron = require('electron'),
 	winston = require('winston'),
 	moment = require('moment'),
 	BrowserWindow = electron.BrowserWindow,
-	uuid = require('node-uuid'),
+	uuid = require('uuid'),
 	Q = require('q'),
 	events = require('events'),
 	ee = new events.EventEmitter(),
@@ -20,6 +21,8 @@ var electron = require('electron'),
 	capture = require('./lib/capture-report.js')(ee),
 	log = {};
 
+	console.log(process.version);
+
 mcopy.cfg = {};
 mcopy.cfgFile = './data/cfg.json';
 mcopy.cfgInit = function () {
diff --git a/app/package.json b/app/package.json
index 122eeb8..d3976fb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -23,20 +23,21 @@
   },
   "homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
   "devDependencies": {
-    "electron-packager": "^6.0.2",
-    "electron-prebuilt": "^0.37.5",
-    "electron-rebuild": "^1.1.3",
+    "electron-inspector": "^0.1.4",
+    "electron-packager": "^8.4.0",
+    "electron-prebuilt": "^1.4.12",
+    "electron-rebuild": "^1.4.0",
     "gulp": "^3.9.1",
-    "gulp-concat": "^2.6.0",
-    "gulp-less": "^3.0.5"
+    "gulp-concat": "^2.6.1",
+    "gulp-less": "^3.3.0"
   },
   "dependencies": {
-    "humanize-duration": "^3.7.0",
-    "moment": "^2.12.0",
-    "node-notifier": "^4.5.0",
-    "node-uuid": "^1.4.7",
+    "humanize-duration": "^3.10.0",
+    "moment": "^2.17.1",
+    "node-notifier": "^4.6.1",
     "q": "^1.4.1",
-    "serialport": "^2.1.0",
-    "winston": "^2.2.0"
+    "serialport": "^4.0.7",
+    "uuid": "^3.0.1",
+    "winston": "^2.3.0"
   }
 }
diff --git a/app/src/index.js b/app/src/index.js
index 623d88e..59f9cc1 100644
--- a/app/src/index.js
+++ b/app/src/index.js
@@ -2,7 +2,7 @@ var remote = require('remote'),
 	dialog = require('electron').remote.dialog,
 	notifier = require('node-notifier'),
 	fs = require('fs'),
-	uuid = require('node-uuid'),
+	uuid = require('uuid'),
 	moment = require('moment'),
 	humanizeDuration = require('humanize-duration')
 	ipcRenderer = require('electron').ipcRenderer,
diff --git a/ino/mcopy_light_tests/mcopy_light_tests.ino b/ino/mcopy_light_tests/mcopy_light_tests.ino
index d6038a0..e9168c7 100644
--- a/ino/mcopy_light_tests/mcopy_light_tests.ino
+++ b/ino/mcopy_light_tests/mcopy_light_tests.ino
@@ -41,11 +41,11 @@ const int serialDelay = 5;
 void setup () {
 	Serial.begin(57600);
 	Serial.flush();
-  Serial.setTimeout(serialDelay);
+	Serial.setTimeout(serialDelay);
 	//pixieSerial.begin(115200); // Pixie REQUIRES this baud rate
-  light.begin();
-  light.setPixelColor(0, 0, 0, 0);
-  light.show();
+	light.begin();
+	light.setPixelColor(0, 0, 0, 0);
+	light.show();
 }
 
 void loop () {