Merge branch '0.9.11' into 225-nvm_fail

README.md

@@ -2,9 +2,9 @@
 
 A binary package building tool for [Lisk](https://lisk.io/). Allows automated compilation of binary packages, with support for multiple posix-based operating systems.
 
-Please read [Installing Lisk (from Binaries)](https://github.com/LiskHQ/lisk-docs/blob/master/BinaryInstall.md) if you are merely looking to install Lisk onto an already supported operating system / architecture.
+Please read [how to install Lisk (from Binaries)](https://docs.lisk.io/docs/core-pre-installation-binary) if you are merely looking to install Lisk onto an already supported operating system / architecture.
 
-[![Build Status](https://travis-ci.org/LiskHQ/lisk-build.svg?branch=development)](https://travis-ci.org/LiskHQ/lisk-build)
+[![Build Status](https://jenkins.lisk.io/buildStatus/icon?job=lisk-build/development)](https://jenkins.lisk.io/job/lisk-build/job/development)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
 
 ## Platforms
@@ -80,10 +80,10 @@ To build a package, perform the following on a machine matching your target arch
   bash build.sh -n NETWORK -v VERSION
   ```
 
-## Authors
+## Contributors
+
+https://github.com/LiskHQ/lisk-build/graphs/contributors
 
-- Isabella Dell <[email protected]>
-- Oliver Beddows <[email protected]>
 
 ## License
 

build.sh

@@ -135,8 +135,8 @@ fi
 if [ ! -d "$BUILD_NAME/node_modules" ]; then
 	exec_cmd "rm -rf $BUILD_NAME"
 	exec_cmd "tar -xf $VERSION.tar.gz"
-	exec_cmd "cp -Rf $VERSION $BUILD_NAME"
-	exec_cmd "cp -R $POSTGRESQL_DIR/$POSTGRESQL_OUT $BUILD_NAME/"
+	exec_cmd "cp -vRf $VERSION $BUILD_NAME"
+	exec_cmd "cp -vRf $POSTGRESQL_DIR/$POSTGRESQL_OUT $BUILD_NAME/"
 	exec_cmd "mkdir $BUILD_NAME/bin"
 	exec_cmd "mkdir $BUILD_NAME/lib"
 
@@ -175,10 +175,11 @@ if [ ! -d "$BUILD_NAME/node_modules" ]; then
 	cd ../ || exit 2
 fi
 
-echo "Copying scripts..."
+echo "Installing lisk-scripts..."
 echo "--------------------------------------------------------------------------"
-exec_cmd "cp -f ../shared.sh ../scripts/* $BUILD_NAME/"
-exec_cmd "cp -fR ../etc $BUILD_NAME/"
+exec_cmd "wget $LISK_SCRIPTS_URL -O $LISK_SCRIPTS_FILE"
+exec_cmd "tar -zxvf $LISK_SCRIPTS_FILE"
+exec_cmd "cp -vRf $LISK_SCRIPTS_DIR/packaged/* $BUILD_NAME"
 
 echo "Building node..."
 echo "--------------------------------------------------------------------------"
@@ -195,7 +196,7 @@ if [ ! -f "$NODE_DIR/$NODE_OUT/bin/node" ] || [ ! -f "$NODE_DIR/$NODE_OUT/bin/np
 	exec_cmd "make install"
 	cd ../ || exit 2
 fi
-exec_cmd "cp -vR $NODE_DIR/$NODE_OUT/* $BUILD_NAME/"
+exec_cmd "cp -vRf $NODE_DIR/$NODE_OUT/* $BUILD_NAME/"
 exec_cmd "sed $SED_OPTS \"s%$(head -1 "$NPM_CLI")%#\!.\/bin\/node%g\" $NPM_CLI"
 
 cd "$BUILD_NAME" || exit 2

clean.sh

@@ -39,16 +39,11 @@ cd ../ || exit 2
 mkdir -p src
 cd src || exit 2
 
-exec_cmd "rm -vrf $VERSION.*"
-exec_cmd "rm -vrf lisk-$VERSION-*"
-
 if [ "$1" = "all" ]; then
-	exec_cmd "rm -vrf $SODIUM_DIR"
-	exec_cmd "rm -vrf $NODE_SODIUM_DIR"
-	exec_cmd "rm -vrf $POSTGRESQL_DIR"
-	exec_cmd "rm -vrf $LISK_NODE_DIR"
-	exec_cmd "rm -vrf $NODE_DIR"
-	exec_cmd "rm -vrf *.tar.gz"
+	exec_cmd "rm -vrf *"
+elif [ "$VERSION" != "" ]; then
+	exec_cmd "rm -vrf $VERSION.*"
+	exec_cmd "rm -vrf lisk-$VERSION-*"
 fi
 
 cd ../ || exit 2

config.sh

@@ -36,9 +36,13 @@ LISK_NETWORK="$LISK_NETWORK"
 LISK_URL="https://downloads.lisk.io/lisk/$LISK_NETWORK/$VERSION/$LISK_FILE"
 LISK_CONFIG=""
 
-NODE_DIR="node-v6.12.0"
+LISK_SCRIPTS_DIR="lisk-scripts-master"
+LISK_SCRIPTS_FILE="$LISK_SCRIPTS_DIR.tar.gz"
+LISK_SCRIPTS_URL="https://github.com/LiskHQ/lisk-scripts/archive/master.tar.gz"
+
+NODE_DIR="node-v6.12.2"
 NODE_FILE="$NODE_DIR.tar.gz"
-NODE_URL="https://nodejs.org/download/release/v6.12.0/$NODE_FILE"
+NODE_URL="https://nodejs.org/download/release/v6.12.2/$NODE_FILE"
 NODE_OUT="compiled"
 NODE_CONFIG=""