From 4ccdd8bb22a1a0805588cf994735275871a51d48 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Wed, 13 Feb 2019 02:33:27 +0100
Subject: [PATCH] fixed detect HDD size

---
 home.admin/30initHDD.sh     | 4 +++-
 home.admin/50cloneHDD.sh    | 2 +-
 home.admin/50copyHDD.sh     | 2 +-
 home.admin/50downloadHDD.sh | 6 +++---
 home.admin/50syncHDD.sh     | 2 +-
 home.admin/50torrentHDD.sh  | 2 +-
 home.admin/60finishHDD.sh   | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/home.admin/30initHDD.sh b/home.admin/30initHDD.sh
index 565c975..ac7dc9d 100755
--- a/home.admin/30initHDD.sh
+++ b/home.admin/30initHDD.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+## get basic info
+source /home/admin/raspiblitz.info 2>/dev/null
+
 echo ""
 echo "*** Checking if HDD is connected ***"
 sleep 5
@@ -40,7 +43,6 @@ if [ ${existsHDD} -eq 1 ]; then
     minSize=31000000000
   fi
   isSize=$(lsblk -o NAME,SIZE -b | grep "${device}" | awk '$1=$1' | cut -d " " -f 2)
-  echo "isSize(${num1Kblocks})"
   if [ ${isSize} -lt ${minSize} ]; then
     if [ ${isSize} -gt 1 ]; then
       echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
diff --git a/home.admin/50cloneHDD.sh b/home.admin/50cloneHDD.sh
index 6ead3d4..591b77d 100644
--- a/home.admin/50cloneHDD.sh
+++ b/home.admin/50cloneHDD.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ## get basic info
-source /home/admin/raspiblitz.info 2>/dev/null
+source /home/admin/raspiblitz.info
 
 echo ""
 echo "*** Check 1st HDD ***"
diff --git a/home.admin/50copyHDD.sh b/home.admin/50copyHDD.sh
index 0597432..d3d7ba2 100755
--- a/home.admin/50copyHDD.sh
+++ b/home.admin/50copyHDD.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ## get basic info
-source /home/admin/raspiblitz.info 2>/dev/null
+source /home/admin/raspiblitz.info
 
 # get local ip
 localip=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
diff --git a/home.admin/50downloadHDD.sh b/home.admin/50downloadHDD.sh
index b3fc0ed..0fbb9fd 100755
--- a/home.admin/50downloadHDD.sh
+++ b/home.admin/50downloadHDD.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 echo ""
 
+## get basic info
+source /home/admin/raspiblitz.info
+
 # *** BITCOIN (just mainnet) ***
 bitcoinList="" # url to list with other sources
 #bitcoinUrl="ftp://anonymous:anonymous@91.83.237.185:21/raspiblitz-bitcoin-2018-07-16"
@@ -15,9 +18,6 @@ litecoinSize=22220000 # 22221160-tolerance
 # NOTE TO GET THE SIZE RIGHT: for new download add 9999999999 as size. Run download.
 # When finished the warning comes up and behind WARNING: copy that number
 
-## get basic info
-source /home/admin/raspiblitz.info 2>/dev/null
-
 # settings based on network
 list=$bitcoinList
 url=$bitcoinUrl
diff --git a/home.admin/50syncHDD.sh b/home.admin/50syncHDD.sh
index e0328b8..5cbaf78 100755
--- a/home.admin/50syncHDD.sh
+++ b/home.admin/50syncHDD.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ## get basic info
-source /home/admin/raspiblitz.info 2>/dev/null
+source /home/admin/raspiblitz.info
 
 # only show warning when bitcoin
 if [ "$network" = "bitcoin" ]; then
diff --git a/home.admin/50torrentHDD.sh b/home.admin/50torrentHDD.sh
index 096c33d..57a2cc2 100755
--- a/home.admin/50torrentHDD.sh
+++ b/home.admin/50torrentHDD.sh
@@ -5,7 +5,7 @@ echo ""
 # why there are two torrent files
 
 ## get basic info
-source /home/admin/raspiblitz.info 2>/dev/null
+source /home/admin/raspiblitz.info
 
 # make sure rtorrent is available
 sudo apt-get install rtorrent -y
diff --git a/home.admin/60finishHDD.sh b/home.admin/60finishHDD.sh
index 471011f..a168bb9 100755
--- a/home.admin/60finishHDD.sh
+++ b/home.admin/60finishHDD.sh
@@ -2,7 +2,7 @@
 echo ""
 
 ## get basic info
-source /home/admin/raspiblitz.info 2>/dev/null
+source /home/admin/raspiblitz.info
 
 echo "*** Checking HDD ***"
 mountOK=$(df | grep -c /mnt/hdd)