1
0
Эх сурвалжийг харах

Fixing pre-rebuild and merging

Andrew Chalkley 8 жил өмнө
parent
commit
cc4d563ac1
2 өөрчлөгдсөн 11 нэмэгдсэн , 4 устгасан
  1. 1 2
      package.json
  2. 10 2
      scripts/pre-rebuild.js

+ 1 - 2
package.json

@@ -6,7 +6,6 @@
   "scripts": {
     "start": "electron .",
     "test": "mocha",
-
     "pre-rebuild": "node ./scripts/pre-rebuild.js",
     "rebuild": "cd node_modules/serialport && node-gyp rebuild --target=1.2.5 --arch=x64 --dist-url=https://atom.io/download/atom-shell",
    
@@ -54,6 +53,7 @@
     "decompress": "^4.0.0",
     "electron-squirrel-startup": "^1.0.0",
     "request": "^2.72.0",
+    "rimraf": "^2.5.3",
     "serialport": "4.0.0"
   },
   "devDependencies": {
@@ -61,7 +61,6 @@
     "electron-packager": "^7.1.0",
     "electron-prebuilt": "^1.2.5",
     "electron-winstaller": "^2.3.1",
-    "jshint": "^2.9.2",
     "mocha": "^2.5.3"
   }
 }

+ 10 - 2
scripts/pre-rebuild.js

@@ -4,5 +4,13 @@ const rootPath = path.join(__dirname, '..')
 const nslog = path.join(rootPath, 'node_modules', 'nslog', 'build', 'Release', 'nslog.node');
 const serial_port = path.join(rootPath, 'node_modules', 'serialport', 'build', 'Release', 'serialport.node');
 
-fs.unlinkSync(nslog);
-fs.unlinkSync(serial_port);
+try {
+    fs.unlinkSync(nslog);
+} catch(e) {
+    //Eat error
+}
+try {
+    fs.unlinkSync(serial_port);
+} catch(e) {
+    //Eat error
+}