From a5d83c9ad68874ec77551f48e16f16c6508579f5 Mon Sep 17 00:00:00 2001 From: mawenpeng Date: Mon, 26 Mar 2018 10:47:32 +0800 Subject: [PATCH] Fix disk space issues if showing with TB instead of GB. --- scripts/eosio_build_centos.sh | 6 ++++-- scripts/eosio_build_fedora.sh | 6 ++++-- scripts/eosio_build_ubuntu.sh | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index 23855dd73..c9118bbda 100644 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -7,8 +7,10 @@ CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\ -f2 ) DISK_INSTALL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f1` - DISK_TOTAL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f2 | sed 's/[^0-9\.]//g'` - DISK_AVAIL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f4 | sed 's/[^0-9\.]//g'` + DISK_TOTAL_KB=`df . | tail -1 | awk '{print $2}'` + DISK_AVAIL_KB=`df . | tail -1 | awk '{print $4}'` + DISK_TOTAL=$(( $DISK_TOTAL_KB / 1048576 )) + DISK_AVAIL=$(( $DISK_AVAIL_KB / 1048576 )) printf "\n\tOS name: $OS_NAME\n" printf "\tOS Version: ${OS_VER}\n" diff --git a/scripts/eosio_build_fedora.sh b/scripts/eosio_build_fedora.sh index 81fdd3598..f3cfcaf85 100644 --- a/scripts/eosio_build_fedora.sh +++ b/scripts/eosio_build_fedora.sh @@ -6,8 +6,10 @@ CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\ -f2 ) DISK_INSTALL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f1` - DISK_TOTAL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f2 | sed 's/[^0-9\.]//g'` - DISK_AVAIL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f4 | sed 's/[^0-9\.]//g'` + DISK_TOTAL_KB=`df . | tail -1 | awk '{print $2}'` + DISK_AVAIL_KB=`df . | tail -1 | awk '{print $4}'` + DISK_TOTAL=$(( $DISK_TOTAL_KB / 1048576 )) + DISK_AVAIL=$(( $DISK_AVAIL_KB / 1048576 )) printf "\n\tOS name: $OS_NAME\n" printf "\tOS Version: ${OS_VER}\n" diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh index 6bfce6687..e6247413f 100644 --- a/scripts/eosio_build_ubuntu.sh +++ b/scripts/eosio_build_ubuntu.sh @@ -8,8 +8,10 @@ CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\ -f2 ) DISK_INSTALL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f1` - DISK_TOTAL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f2 | sed 's/[^0-9\.]//g'` - DISK_AVAIL=`df -h . | tail -1 | tr -s ' ' | cut -d\ -f4 | sed 's/[^0-9\.]//g'` + DISK_TOTAL_KB=`df . | tail -1 | awk '{print $2}'` + DISK_AVAIL_KB=`df . | tail -1 | awk '{print $4}'` + DISK_TOTAL=$(( $DISK_TOTAL_KB / 1048576 )) + DISK_AVAIL=$(( $DISK_AVAIL_KB / 1048576 )) printf "\n\tOS name: $OS_NAME\n" printf "\tOS Version: ${OS_VER}\n" -- GitLab