You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/07/25 12:16:02 UTC

jena git commit: JENA-977: Fix for size issues (work in bytes)

Repository: jena
Updated Branches:
  refs/heads/master 62558f47b -> f6a74c907


JENA-977: Fix for size issues (work in bytes)


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6a74c90
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6a74c90
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6a74c90

Branch: refs/heads/master
Commit: f6a74c907a57e87210350af5f08ca69dd564b4ad
Parents: 62558f4
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jul 25 11:15:53 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jul 25 11:15:53 2015 +0100

----------------------------------------------------------------------
 apache-jena/bin/tdbloader2common | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f6a74c90/apache-jena/bin/tdbloader2common
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2common b/apache-jena/bin/tdbloader2common
index 6c16944..b5f0dbf 100644
--- a/apache-jena/bin/tdbloader2common
+++ b/apache-jena/bin/tdbloader2common
@@ -63,21 +63,22 @@ function getSize() {
 function getDriveInfo() {
   local DIR=$1
 
-  local DRIVE_INFO=$(df "$DIR" | tail -n +2)
+  local DRIVE_INFO=$(df -k "$DIR" | tail -n +2)
   if [ -z "${DRIVE_INFO}" ]; then
     abort 1 "Failed to get drive information for $DIR"
   fi
   local DISK=$(echo $DRIVE_INFO | awk '{print $1}')
   local FREE_BYTES=$(echo $DRIVE_INFO | awk '{print $4}')
+  FREE_BYTES="$(($FREE_BYTES * 1024))"
   local USED_PERCENT=$(echo $DRIVE_INFO | awk '{print $5}')
   USED_PERCENT=${USED_PERCENT/"%"/}
   local FREE_PERCENT=$((100 - $USED_PERCENT))
 
   local INFO=()
-  INFO[0]=$DISK
-  INFO[1]=$USED_PERCENT
-  INFO[2]=$FREE_PERCENT
-  INFO[3]=$FREE_BYTES
+  INFO[0]="$DISK"
+  INFO[1]="$USED_PERCENT"
+  INFO[2]="$FREE_PERCENT"
+  INFO[3]="$FREE_BYTES"
 
   echo ${INFO[@]}
 }
@@ -210,4 +211,4 @@ function makeAbsolute() {
 #DATE="+%Y-%m-%dT%H:%M:%S%:z"
 DATE="+%H:%M:%S"
 
-PKG=org.apache.jena.tdb.store.bulkloader2
\ No newline at end of file
+PKG=org.apache.jena.tdb.store.bulkloader2