Merge pull request #410 from fluidvoice/master

minor display changes

README.md

@@ -50,6 +50,7 @@ These are the community currated shopping lists based on country:
 
 * [Germany](shoppinglist_de.md) *(reference shopping list)*
 * [USA](shoppinglist_usa.md)
+* [Canada](shoppinglist_ca.md)
 * [UK](shoppinglist_uk.md)
 * [Switzerland](shoppinglist_ch.md)
 * [France](shoppinglist_fr.md)

home.admin/00infoBlitz.sh

@@ -91,7 +91,7 @@ if [ -n ${btc_path} ]; then
     block_diff=$(expr ${block_chain} - ${block_verified})
 
     progress="$(echo "${blockchaininfo}" | jq -r '.verificationprogress')"
-    sync_percentage=$(printf "%.2f%%" "$(echo $progress | awk '{print 100 * $1}')")
+    sync_percentage=$(echo $progress | awk '{printf( "%.2f%%", 100 * $1)}')
 
     if [ ${block_diff} -eq 0 ]; then    # fully synced
       sync="OK"

home.admin/00infoLCD.sh

@@ -80,12 +80,11 @@ while :
       # when in presync - get more info on progress
       elif [ "${state}" = "presync" ]; then
         # get blockchain sync progress
-        blockchaininfo="$(sudo -u root bitcoin-cli -conf=/home/admin/assets/bitcoin.conf getblockchaininfo 2>/dev/null)"
+        blockchaininfo="$(sudo -u root ${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo 2>/dev/null)"
         message="starting"
         if [ ${#blockchaininfo} -gt 0 ]; then
           message="$(echo "${blockchaininfo}" | jq -r '.verificationprogress')"
-          message=$(echo "${message}*100" | bc)
-          message="${message}%"
+          message=$(echo $message | awk '{printf( "%.2f%%", 100 * $1)}')
         fi
 
       # when old data - improve message

home.admin/80scanLND.sh

@@ -46,7 +46,8 @@ scanstate="${item}/${total}"
 
 # get blockchain sync progress
 progress="$(echo "${blockchaininfo}" | jq -r '.verificationprogress')"
-progress=$(echo "${progress}*100" | bc)
+#progress=$(echo "${progress}*100" | bc)
+progress=$(echo $progress | awk '{printf( "%.2f%%", 100 * $1)}')
 
 # check if blockchain is still syncing
 heigh=6
@@ -88,4 +89,5 @@ fi
 
 # display progress to user
 sleep 3
-dialog --title " ${network} / ${chain} " --backtitle "RaspiBlitz (${hostname})" --infobox "${infoStr}" ${heigh} ${width}
+temp=$(echo "scale=1; $(cat /sys/class/thermal/thermal_zone0/temp)/1000" | bc)
+dialog --title " ${network} / ${chain} " --backtitle "RaspiBlitz (${hostname})     CPU: ${temp}°C" --infobox "${infoStr}" ${heigh} ${width}

home.admin/config.scripts/network.reindex.sh

@@ -59,6 +59,7 @@ while [ ${finished} -eq 0 ]
   blockchaininfo=$(sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo)
   progress=$(echo "${blockchaininfo}" | jq -r '.verificationprogress')
   #progress=$(echo "${progress}*100" | bc)
+  progress=$(echo $progress | awk '{printf( "%.2f%%", 100 * $1)}')
   inprogress="$(echo "${blockchaininfo}" | jq -r '.initialblockdownload')"
   if [ "${inprogress}" = "false" ]; then
     finished=1

shoppinglist_ca.md

@@ -0,0 +1,7 @@
+## Shopping List: Amazon Canada
+
+* RaspBerry Pi 3: https://amzn.to/2NDLD31
+* Micro SD-Card 16GB: https://amzn.to/2NEXWMa
+* Power: https://amzn.to/2NCdCju
+* 1TB Hard Drive: https://amzn.to/2NF0lqj
+* LCD-Display + Case + Pen: https://amzn.to/2GWx3D8 

shoppinglist_es.md

@@ -0,0 +1,8 @@
+## Shopping List: Amazon Spain
+
+* RaspBerry Pi 3: https://www.amazon.es/gp/product/B07BDR5PDW/
+* Micro SD-Card 16GB: https://www.amazon.es/gp/product/B073K14CVB/
+* Power: https://www.amazon.es/gp/product/B01JZE38QE
+* 1TB Hard Drive: https://www.amazon.es/gp/product/B07997KKSK/
+* Case: https://www.amazon.es/gp/product/B07DK4CRHS/
+* LCD-Display: https://www.amazon.es/gp/product/B01MZZ1VY1/