Merge branch 'master' into k-system

eosio_build.sh

@@ -143,6 +143,7 @@
 				export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
 				export CMAKE=${HOME}/opt/cmake/bin/cmake
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
+				export BOOST_ROOT="${HOME}/opt/boost"
 			;;
 			"CentOS Linux")
 				FILE="${PWD}/scripts/eosio_build_centos.sh"
@@ -152,6 +153,7 @@
 				export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
 				export CMAKE=${HOME}/opt/cmake/bin/cmake
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			"elementary OS")
 				FILE="${PWD}/scripts/eosio_build_ubuntu.sh"
@@ -159,6 +161,7 @@
 				C_COMPILER=clang-4.0
 				MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			"Fedora")
 				FILE="${PWD}/scripts/eosio_build_fedora.sh"
@@ -166,6 +169,7 @@
 				C_COMPILER=gcc
 				MONGOD_CONF=/etc/mongod.conf
 				export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			"Linux Mint")
 				FILE="${PWD}/scripts/eosio_build_ubuntu.sh"
@@ -173,6 +177,7 @@
 				C_COMPILER=clang-4.0
 				MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			"Ubuntu")
 				FILE="${PWD}/scripts/eosio_build_ubuntu.sh"
@@ -180,13 +185,13 @@
 				C_COMPILER=clang-4.0
 				MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
 				export PATH=${HOME}/opt/mongodb/bin:$PATH
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			*)
 				printf "\\n\\tUnsupported Linux Distribution. Exiting now.\\n\\n"
 				exit 1
 		esac
 
-		export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 		OPENSSL_ROOT_DIR=/usr/include/openssl
 		WASM_ROOT="${HOME}/opt/wasm"
 	fi

scripts/eosio_build_amazon.sh

@@ -211,6 +211,23 @@
 		printf "\\tCMAKE found @ %s.\\n" "${CMAKE}"
 	fi
 
+	if [ -d "${HOME}/opt/boost_1_67_0" ]; then
+		if ! mv "${HOME}/opt/boost_1_67_0" "$BOOST_ROOT"
+		then
+			printf "\\n\\tUnable to move directory ${HOME}/opt/boost_1_67_0 to ${BOOST_ROOT}.\\n"
+			printf "\\n\\tExiting now.\\n"
+			exit 1
+		fi
+		if [ -d "$BUILD_DIR" ]; then
+			if ! rm -rf "$BUILD_DIR"
+			then
+			printf "\\tUnable to remove directory %s. Please remove this directory and run this script %s again. 0\\n" "$BUILD_DIR" "${BASH_SOURCE[0]}"
+			printf "\\tExiting now.\\n\\n"
+			exit 1;
+			fi
+		fi
+	fi
+	
 	printf "\\n\\tChecking boost library installation.\\n"
 	BVERSION=$( grep "BOOST_LIB_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \
 	| tail -1 | tr -s ' ' | cut -d\  -f3 | sed 's/[^0-9\._]//gI' )
@@ -280,9 +297,9 @@
 			exit 1;
 			fi
 		fi
-		printf "\\tBoost successfully installed @ %s/opt/boost_1_67_0.\\n" "${HOME}"
+		printf "\\tBoost successfully installed @ %s.\\n" "${BOOST_ROOT}"
 	else
-		printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n" "${HOME}"
+		printf "\\tBoost 1.67.0 found at %s.\\n" "${BOOST_ROOT}"
 	fi
 
 	printf "\\n\\tChecking MongoDB installation.\\n"