Minor clean-ups and fixes

Author: piranna

package.json

@@ -51,7 +51,7 @@
   "dependencies": {
     "async": "^2.1.2",
     "download-manager": "^0.1.3",
-    "fs-extra": "^0.30.0",
+    "fs-extra": "^1.0.0",
     "prebuild-install": "1.0.2"
   },
   "devDependencies": {

scripts/adjustEnvVars.sh

@@ -28,7 +28,7 @@ while getopts ":b:c:M:" opt; do
 
     :)
       echo "Option -$OPTARG requires an argument." >&2
-      exit 1
+      exit 2
     ;;
   esac
 done

scripts/prepublish

@@ -1,30 +1,37 @@
 #!/usr/bin/env node
 
-// Reset the generic bin symlinks before publishing to npm sothey point to the
-// native platform libraries
+/**
+ * Reset the generic bin symlinks before publishing to npm so they point to the
+ * native platform libraries
+ */
 
 const fs = require('fs')
 
 
-const DIR = 'bin'
-const bins = Object.keys(require('../package.json').bin)
-const bypass = fs.readFileSync('bypass.js')
-
-
 // http://stackoverflow.com/a/34597104/586382
 // By design, NPM will run prepublish script after `npm install` (see
 // [npm docs](https://docs.npmjs.com/misc/scripts))
 // This trick ensures that when script is executed using `npm <whatever>` it is
 // run only when the command is `npm publish`.
 const npm_config_argv = process.env.npm_config_argv
-if(npm_config_argv && JSON.parse(npm_config_argv).original[0] === 'publish')
+if(npm_config_argv && JSON.parse(npm_config_argv).original[0] === 'publish'
+|| process.argv[2] === '--force')
+{
+  const DIR = 'bin'
+
   fs.mkdir(DIR, function(err)
   {
     if(err && err.code !== 'EEXIST') throw err
 
-    // Re-create the symlinks stubs
-    bins.forEach(function(file)
+    fs.readFile('bypass.js', function(err, bypass)
     {
-      fs.writeFileSync(DIR+'/'+file, bypass, {mode: 0o755})
+      if(err) throw err
+
+      // Re-create the symlinks stubs
+      Object.keys(require('../package.json').bin).forEach(function(file)
+      {
+        fs.writeFileSync(DIR+'/'+file, bypass, {mode: 0o755})
+      })
     })
   })
+}

scripts/unbuild

@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 
 rm -rf build/ deps/
-rm -rf bin/ lib/ libexec/ share/ *-nodeos-linux-musl/
+rm -rf bin/ lib/ libexec/ share/ *-nodeos-linux-*/
+
+npm run prepublish -- --force