Move build_libzmq.sh -> scripts/build_libzmq.sh

Author: lgeiger

build_libzmq.sh scripts/build_libzmq.shbuild_libzmq.sh renamed to scripts/build_libzmq.sh

@@ -9,15 +9,16 @@ ZMQ_REPO=zeromq/zeromq4-1
 realpath() {
     [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
 }
-export ZMQ_PREFIX="$(dirname $(realpath $0))/zmq"
+export MAIN_DIR="$(dirname $(realpath $0))/../"
+export ZMQ_PREFIX=$MAIN_DIR/zmq
 export ZMQ_SRC_DIR=zeromq-$ZMQ
 cd $ZMQ_PREFIX
 
 export CFLAGS=-fPIC
 export CXXFLAGS=-fPIC
 export PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig
 
-test -f zeromq-$ZMQ.tar.gz || ZMQ=$ZMQ ZMQ_REPO=$ZMQ_REPO node ../scripts/download-zmq.js
+test -f zeromq-$ZMQ.tar.gz || ZMQ=$ZMQ ZMQ_REPO=$ZMQ_REPO node $MAIN_DIR/scripts/download-zmq.js
 test -d $ZMQ_SRC_DIR || tar xzf zeromq-$ZMQ.tar.gz
 cd $ZMQ_SRC_DIR
 

scripts/preinstall.js

@@ -1,8 +1,10 @@
+var download = require('./download').download;
+var spawn = require('child_process').spawn;
+var path = require('path');
+var fs = require('fs');
+
 if (process.platform === 'win32') {
   console.log('Downloading libzmq for Windows')
-  var download = require('./download').download;
-  var path = require('path');
-  var fs = require('fs');
 
   var TAR_URL = 'https://github.com/nteract/libzmq-win/releases/download/v1.0.0/libzmq-' + process.arch + '.lib';
   var DIR_NAME = path.join(__dirname, '..', 'windows', 'lib');
@@ -16,12 +18,11 @@ if (process.platform === 'win32') {
 } else {
   console.log('Building libzmq for ' + process.platform)
 
-  var spawn = require('child_process').spawn;
-  var child = spawn('./build_libzmq.sh');
+  var child = spawn('./scripts/build_libzmq.sh');
 
   child.stdout.pipe(process.stdout);
   child.stderr.pipe(process.stderr);
   child.on('error', (err) => {
-  console.log('Failed to start child process.');
-});
+    console.log('Failed to start child process.');
+  });
 }