Merge pull request #3660 from pacificcode/eosio_build_centos

Build Centos: moved opt/boost_1_67_0 to opt/boost

eosio_build.sh

@@ -153,7 +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"
+				export BOOST_ROOT="${HOME}/opt/boost"
 			;;
 			"elementary OS")
 				FILE="${PWD}/scripts/eosio_build_ubuntu.sh"

scripts/eosio_build_centos.sh

@@ -298,6 +298,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 %s/opt/boost_1_67_0 to %s.\\n" "${HOME}" "${BOOST_ROOT}"
+			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 "#define BOOST_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \
 	| tail -1 | tr -s ' ' | cut -d\  -f3)
@@ -366,9 +383,9 @@
 			exit 1;
 			fi
 		fi
-		printf "\\tBoost 1.67.0 successfully installed @ %s/opt/boost_1_67_0.\\n\\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\\n" "${HOME}"
+		printf "\\tBoost 1.67.0 found at %s.\\n\\n" "${BOOST_ROOT}"
 	fi
 
 	printf "\\n\\tChecking MongoDB installation.\\n"