提交 a2265a61 编写于 作者: B Bill Hamilton

Darwin: added version check for installation of python3

上级 4fa9403d
......@@ -30,20 +30,22 @@
# https://github.com/EOSIO/eos/blob/master/LICENSE.txt
##########################################################################
VERSION=1.1
VERSION=1.2
ULIMIT=$( ulimit -u )
WORK_DIR=$PWD
BUILD_DIR=${WORK_DIR}/build
TEMP_DIR=/tmp
ARCH=$( uname )
DISK_MIN=20
PYTHON_MIN=3
TIME_BEGIN=$( date -u +%s )
txtbld=$(tput bold)
bldred=${txtbld}$(tput setaf 1)
txtrst=$(tput sgr0)
printf "\n\t$( date -u )\n"
DISK_MIN=20
PYTHON_MIN=3
printf "\n\tBeginning build version: ${VERSION}\n"
printf "\t$( date -u )\n"
printf "\tgit head id: $( cat .git/refs/heads/master )\n"
printf "\tCurrent branch: $( git branch | grep \* )\n"
printf "\n\tARCHITECTURE: ${ARCH}\n"
......@@ -174,7 +176,7 @@
TIME_END=$(( `date -u +%s` - $TIME_BEGIN ))
printf "\t _______ _______ _______ _________ _______\n"
printf "\t _______ _______ _______ _________ _______\n"
printf "\t( ____ \( ___ )( ____ \\__ __/( ___ )\n"
printf "\t| ( \/| ( ) || ( \/ ) ( | ( ) |\n"
printf "\t| (__ | | | || (_____ | | | | | |\n"
......
......@@ -5,7 +5,7 @@
MEM_GIG=`bc <<< "($(sysctl -in hw.memsize) / 1024000000)"`
CPU_SPEED=`bc <<< "scale=2; ($(sysctl -in hw.cpufrequency) / 100000000) / 10"`
CPU_SPEED=`bc <<< "scale=2; ($(sysctl -in hw.cpufrequency) / 10^6) / 10"`
CPU_CORE=$( sysctl -in machdep.cpu.core_count )
blksize=`df . | head -1 | awk '{print $2}' | cut -d- -f1`
......@@ -22,7 +22,7 @@
printf "\tPhysical Memory: $MEM_GIG Gbytes\n"
printf "\tDisk space total: ${DISK_TOTAL}G\n"
printf "\tDisk space available: ${DISK_AVAIL}G\n\n"
if [ $MEM_GIG -lt 8 ]; then
echo "Your system must have 8 or more Gigabytes of physical memory installed."
echo "Exiting now."
......@@ -100,7 +100,7 @@
printf '\t\t %s found\n' "$name"
continue
fi
# resolve conflict with homebrew glibtool and apples install of libtool
# resolve conflict with homebrew glibtool and apple/gnu installs of libtool
if [ ${testee} == "/usr/local/bin/glibtool" ]; then
if [ ${tester} "/usr/local/bin/libtool" ]; then
printf '\t\t %s found\n' "$name"
......@@ -117,6 +117,16 @@
let COUNT++
done < scripts/eosio_build_dep
IFS=${var_ifs}
printf "\tChecking Python3 ... "
if [ `python --version | tr - ' ' | cut -d ' ' -f2 | cut -d'.' -f1` != ${PYTHON_MIN} ]; then
DEP=$DEP"python@${PYTHON_MIN} "
DISPLAY="${DISPLAY}${COUNT}. Python 3\n\t"
printf "\t\t python${PYTHON_MIN} ${bldred}NOT${txtrst} found.\n"
let DCOUNT++
else
printf "\t\t Python3 found\n"
fi
if [ $DCOUNT -ne 0 ]; then
printf "\n\tThe following dependencies are required to install EOSIO.\n"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册