Merge branch 'nyxnor-patch-6' into dev

This commit is contained in:
rootzoll 2021-09-14 12:54:47 +02:00
commit ac153ca0ce
2 changed files with 64 additions and 67 deletions

View file

@ -276,6 +276,7 @@ else
echo "For setup logs: cat raspiblitz.log"
echo "or call the command 'debug' to see bigger report."
fi
echo "Blitz command line options: blitz help"
echo "Back to menus use command: raspiblitz"
echo
exit 0

View file

@ -7,16 +7,67 @@ fi
# SHORTCUT COMMANDS you can call as user 'admin' from terminal
# command: raspiblitz
# calls the the raspiblitz mainmenu (legacy)
function raspiblitz() {
# command: blitz
# calls the the raspiblitz mainmenu (shortcut)
function blitz() {
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ] || [ "$1" = "help" ] ; then
echo "_commands.sh"
echo "Usage: command [options]"
echo ""
echo "Blitz commands are consolidated here."
echo ""
echo "Menu access:"
echo " raspiblitz menu"
echo " menu menu"
echo " bash menu"
echo " repair menu > repair"
echo ""
echo "Checks:"
echo " status informational Blitz status screen"
echo " sourcemode copy blockchain source modus"
echo " check check if Blitz configuration files are correct"
echo " debug print debug logs"
echo " debug -l print debug logs with bin link"
echo " patch sync scripts with latest set github and branch"
echo " github jumping directly into the options to change branch/repo/pr"
echo ""
echo "Power:"
echo " restart restart the node"
echo " off shutdown the node"
echo ""
echo "Display:"
echo " hdmi switch video output to HDMI"
echo " lcd switch video output to LCD"
echo " headless switch video output to HEADLESS"
echo ""
echo "BTC tx:"
echo " torthistx broadcast transaction through Tor to Blockstreams API and into the network"
echo " gettx retrieve transaction from mempool or blockchain and print as JSON"
echo " watchtx retrieve transaction from mempool or blockchain until certain confirmation target"
echo ""
echo "LND:"
echo " balance your satoshi balance"
echo " channels your lightning channels"
echo " fwdreport show forwarding report"
echo ""
echo "Users:"
echo " bos Balance of Satoshis"
echo " chantools ChanTools"
echo " lit Lightning Terminal"
echo " jm JoinMarket"
echo " pyblock PyBlock"
echo ""
echo " Extras:"
echo " whitepaper download the whitepaper from the blockchain to /home/admin/bitcoin.pdf"
echo " notifyme wrapper for blitz.notify.sh that will send a notification using the configured method and settings"
else
cd /home/admin
./00raspiblitz.sh
}
# command: blitz
# calls the the raspiblitz mainmenu (shortcut)
function blitz() {
# command: raspiblitz
# calls the the raspiblitz mainmenu (legacy)
function raspiblitz() {
cd /home/admin
./00raspiblitz.sh
}
@ -57,8 +108,12 @@ function release() {
# command: debug
function debug() {
cd /home/admin
/home/admin/config.scripts/blitz.debug.sh
echo "Printing debug logs. Be patient, this should take maximum 2 minutes ..."
if [[ $1 = "-l" ]]; then
/home/admin/config.scripts/blitz.debug.sh > /var/cache/raspiblitz/debug.log && cat /var/cache/raspiblitz/debug.log | torsocks nc termbin.com 9999
else
/home/admin/config.scripts/blitz.debug.sh > /var/cache/raspiblitz/debug.log && cat /var/cache/raspiblitz/debug.log
fi
}
# command: patch
@ -101,20 +156,6 @@ function headless() {
restart
}
# command: manage
function manage() {
if [ $(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c "lndmanage=on") -eq 1 ]; then
cd /home/admin/lndmanage
source venv/bin/activate
echo "NOTICE: Needs at least one active channel to run without error."
echo "to exit (venv) enter ---> deactivate"
lndmanage
else
echo "lndmanage not installed - to install run:"
echo "sudo /home/admin/config.scripts/bonus.lndmanage.sh on"
fi
}
# command: torthistx
function torthistx() {
if [ $(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c "runBehindTor=on") -eq 1 ]; then
@ -228,21 +269,6 @@ function jm() {
fi
}
# command: faraday
# switch to the faraday user for the Faraday Service
function faraday() {
if [ $(grep -c "faraday=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then
echo "# switching to the faraday user with the command: 'sudo su - faraday'"
echo "# use command 'exit' and then 'raspiblitz' to return to menu"
echo "# use command 'frcli --help' now to get more info"
sudo su - faraday
echo "# use command 'raspiblitz' to return to menu"
else
echo "Faraday is not installed - to install run:"
echo "/home/admin/config.scripts/bonus.faraday.sh on"
fi
}
# command: lit
# switch to the lit user for the loop, pool & faraday services
function lit() {
@ -274,36 +300,6 @@ if [ -f "/mnt/hdd/raspiblitz.conf" ] && [ $(grep -c "lit=on" < /mnt/hdd/raspibl
--macaroonpath=/home/lit/.pool/${chain}net/pool.macaroon"
fi
# command: loop
# switch to the loop user for the Lightning Loop Service
function loop() {
if [ $(grep -c "loop=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then
echo "# switching to the loop user with the command: 'sudo su - loop'"
echo "# use command 'exit' and then 'raspiblitz' to return to menu"
echo "# use command 'loop --help' now to get more info"
sudo su - loop
echo "# use command 'raspiblitz' to return to menu"
else
echo "Lightning Loop is not installed - to install run:"
echo "/home/admin/config.scripts/bonus.loop.sh on"
fi
}
# command: pool
# switch to the pool user for the Pool Service
function pool() {
if [ $(grep -c "pool=on" < /mnt/hdd/raspiblitz.conf) -gt 0 ]; then
echo "# switching to the pool user with the command: 'sudo su - pool'"
echo "# use command 'exit' and then 'raspiblitz' to return to menu"
echo "# use command 'pool --help' now to get more info"
sudo su - pool
echo "# use command 'raspiblitz' to return to menu"
else
echo "Pool is not installed - to install run:"
echo "/home/admin/config.scripts/bonus.pool.sh on"
fi
}
# command: gettx
# retrieve transaction from mempool or blockchain and print as JSON
# $ gettx "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16"