Merge branch 'master' into v1.4

This commit is contained in:
rootzoll 2020-03-16 21:08:22 -07:00
commit d5de56b289
5 changed files with 12 additions and 12 deletions

View File

@ -2,7 +2,7 @@
*Build your own Lightning Node on a RaspberryPi with a nice Display.* *Build your own Lightning Node on a RaspberryPi with a nice Display.*
`Version 1.4 with lnd 0.9.0-beta and bitcoin 0.19.1 or litecoin 0.16.3.` `Version 1.4 with lnd 0.9.0-beta and bitcoin 0.19.0.1 or litecoin 0.17.1.`
![RaspiBlitz](pictures/raspiblitz.jpg) ![RaspiBlitz](pictures/raspiblitz.jpg)
@ -665,7 +665,7 @@ It can be used as:
You can also develop extensions on it. You can also develop extensions on it.
[Details on Service](https://github.com/bitromortac/lndmanage/blob/master/README.md) [Details on Service](https://github.com/arcbtc/lnbits/blob/master/README.md)
#### MOBILE: Connect Mobile Wallet #### MOBILE: Connect Mobile Wallet

View File

@ -119,7 +119,7 @@ if [ ${hddGotBlockchain} -eq 0 ]; then
else else
clear clear
echo "# Not formatting the HDD/SSD - Setup Process stopped." echo "# Not formatting the HDD/SSD - Setup Process stopped."
echo "# Rearrange your hardware and retstart with a fresh sd card again." echo "# Rearrange your hardware and restart with a fresh sd card again."
exit 1 exit 1
fi fi

View File

@ -22,7 +22,7 @@ Download LND Data Backup now?
sleep 2 sleep 2
/home/admin/config.scripts/lnd.rescue.sh backup /home/admin/config.scripts/lnd.rescue.sh backup
echo echo
echo "PRESS ENTER to continue once your done downloading." echo "PRESS ENTER to continue once you are done downloading."
read key read key
else else
clear clear

View File

@ -145,7 +145,7 @@ if [ "$1" = "export-gui" ]; then
echo "ON YOUR LAPTOP - RUN IN NEW TERMINAL:" echo "ON YOUR LAPTOP - RUN IN NEW TERMINAL:"
echo "${scpDownload}" echo "${scpDownload}"
echo "" echo ""
echo "Use password A to authenticate file transfere." echo "Use password A to authenticate file transfer."
echo echo
echo "Your Lightning node is now stopped. After download press ENTER to shutdown your raspiblitz." echo "Your Lightning node is now stopped. After download press ENTER to shutdown your raspiblitz."
echo "To complete the data migration follow then instructions on the github FAQ." echo "To complete the data migration follow then instructions on the github FAQ."
@ -218,7 +218,7 @@ if [ "$1" = "import" ]; then
echo "# OK -> checksum looks good: ${md5checksum}" echo "# OK -> checksum looks good: ${md5checksum}"
else else
echo "# FAIL -> Checksum not correct: ${md5checksum}" echo "# FAIL -> Checksum not correct: ${md5checksum}"
echo "# Maybe transfere/upload failed?" echo "# Maybe transfer/upload failed?"
echo "error='bad checksum'" echo "error='bad checksum'"
exit 1 exit 1
fi fi
@ -326,7 +326,7 @@ if [ "$1" = "import-gui" ]; then
echo "COPY, PASTE AND EXECUTE THE FOLLOWING COMMAND:" echo "COPY, PASTE AND EXECUTE THE FOLLOWING COMMAND:"
echo "scp -r ./raspiblitz-*.tar.gz admin@${localip}:${defaultZipPath}" echo "scp -r ./raspiblitz-*.tar.gz admin@${localip}:${defaultZipPath}"
echo "" echo ""
echo "Use password 'raspiblitz' to authenticate file transfere." echo "Use password 'raspiblitz' to authenticate file transfer."
echo "PRESS ENTER when upload is done." echo "PRESS ENTER when upload is done."
read key read key

View File

@ -61,7 +61,7 @@ if [ ${mode} = "backup" ]; then
echo "ON YOUR LAPTOP - RUN IN NEW TERMINAL:" echo "ON YOUR LAPTOP - RUN IN NEW TERMINAL:"
echo "scp -r 'admin@${localip}:/home/admin/lnd-rescue-*.tar.gz' ./" echo "scp -r 'admin@${localip}:/home/admin/lnd-rescue-*.tar.gz' ./"
echo "" echo ""
echo "Use password A to authenticate file transfere." echo "Use password A to authenticate file transfer."
echo echo
echo "BEWARE: Your Lightning node is now stopped. Its safe to backup the data and" echo "BEWARE: Your Lightning node is now stopped. Its safe to backup the data and"
echo "restore it on a fresh RaspiBlitz. But once this Lightning node gets started" echo "restore it on a fresh RaspiBlitz. But once this Lightning node gets started"
@ -98,7 +98,7 @@ elif [ ${mode} = "restore" ]; then
echo "COPY, PASTE AND EXECUTE THE FOLLOWING COMMAND:" echo "COPY, PASTE AND EXECUTE THE FOLLOWING COMMAND:"
echo "scp -r ./lnd-rescue-*.tar.gz admin@${localip}:/home/admin/" echo "scp -r ./lnd-rescue-*.tar.gz admin@${localip}:/home/admin/"
echo "" echo ""
echo "Use password A to authenticate file transfere." echo "Use password A to authenticate file transfer."
echo "PRESS ENTER when upload is done." echo "PRESS ENTER when upload is done."
fi fi
if [ ${countZips} -gt 1 ]; then if [ ${countZips} -gt 1 ]; then
@ -128,7 +128,7 @@ elif [ ${mode} = "restore" ]; then
echo "OK -> checksum looks good: ${md5checksum}" echo "OK -> checksum looks good: ${md5checksum}"
else else
echo "!!! FAIL -> Checksum not correct." echo "!!! FAIL -> Checksum not correct."
echo "Maybe transfere failed? Continue on your own risk!" echo "Maybe transfer failed? Continue on your own risk!"
echo "Recommend to abort and upload again!" echo "Recommend to abort and upload again!"
fi fi
@ -186,7 +186,7 @@ elif [ ${mode} = "scb-down" ]; then
echo "RUN THE FOLLOWING COMMAND ON YOUR LAPTOP IN NEW TERMINAL:" echo "RUN THE FOLLOWING COMMAND ON YOUR LAPTOP IN NEW TERMINAL:"
echo "scp -r admin@${localip}:/home/admin/.lnd/data/chain/${network}/${chain}net/channel.backup ./" echo "scp -r admin@${localip}:/home/admin/.lnd/data/chain/${network}/${chain}net/channel.backup ./"
echo "" echo ""
echo "Use password A to authenticate file transfere." echo "Use password A to authenticate file transfer."
echo echo
echo "NOTE: Use this file when setting up a fresh RaspiBlitz by choosing" echo "NOTE: Use this file when setting up a fresh RaspiBlitz by choosing"
echo "option OLD WALLET and then SCB+SEED -> Seed & channel.backup file" echo "option OLD WALLET and then SCB+SEED -> Seed & channel.backup file"
@ -218,7 +218,7 @@ elif [ ${mode} = "scb-up" ]; then
echo "COPY, PASTE AND EXECUTE THE FOLLOWING COMMAND:" echo "COPY, PASTE AND EXECUTE THE FOLLOWING COMMAND:"
echo "scp ./channel.backup admin@${localip}:/home/admin/" echo "scp ./channel.backup admin@${localip}:/home/admin/"
echo "" echo ""
echo "Use password A to authenticate file transfere." echo "Use password A to authenticate file transfer."
echo "PRESS ENTER when upload is done. Enter x & ENTER to cancel." echo "PRESS ENTER when upload is done. Enter x & ENTER to cancel."
# wait user interaction # wait user interaction