diff --git a/alternative.platforms/display.alternatives.sh b/alternative.platforms/display.alternatives.sh index fec2a644..33777352 100644 --- a/alternative.platforms/display.alternatives.sh +++ b/alternative.platforms/display.alternatives.sh @@ -21,7 +21,7 @@ if [ ${isDietPi} -gt 0 ]; then fi if [ "${baseimage}" = "?" ]; then cat /etc/os-release 2>/dev/null - echo "!!! FAIL !!!" + echo "# FAIL #" echo "Base Image cannot be detected or is not supported." exit 1 else diff --git a/build_sdcard.sh b/build_sdcard.sh index 21e661de..934d77d7 100755 --- a/build_sdcard.sh +++ b/build_sdcard.sh @@ -212,7 +212,7 @@ cpu="$(uname -m)" && echo "cpu=${cpu}" architecture="$(dpkg --print-architecture 2>/dev/null)" && echo "architecture=${architecture}" case "${cpu}" in arm*|aarch64|x86_64|amd64);; - *) echo -e "!!! FAIL !!!\nCan only build on ARM, aarch64, x86_64 not on: cpu=${cpu}"; exit 1;; + *) echo -e "# FAIL #\nCan only build on ARM, aarch64, x86_64 not on: cpu=${cpu}"; exit 1;; esac # AUTO-DETECTION: OPERATINGSYSTEM @@ -234,7 +234,7 @@ if [ $(cat /etc/os-release 2>/dev/null | grep -c 'Debian') -gt 0 ]; then elif [ $(cat /etc/os-release 2>/dev/null | grep -c 'Ubuntu') -gt 0 ]; then baseimage="ubuntu" else - echo "\n!!! FAIL: Base Image cannot be detected or is not supported." + echo "\n# FAIL: Base Image cannot be detected or is not supported." cat /etc/os-release 2>/dev/null uname -a exit 1 @@ -333,7 +333,7 @@ elif [ -f "/usr/bin/python3.8" ]; then sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1 echo "python calls python3.8" else - echo "!!! FAIL !!!" + echo "# FAIL #" echo "There is no tested version of python present" exit 1 fi diff --git a/home.admin/00parallelMainnetServices.sh b/home.admin/00parallelMainnetServices.sh index 482a4864..adbb6cad 100644 --- a/home.admin/00parallelMainnetServices.sh +++ b/home.admin/00parallelMainnetServices.sh @@ -60,7 +60,7 @@ if [ "${lnd}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then echo "# Successfully installed LND on $CHAIN" else - l1="# !!! FAIL on LND on $CHAIN install !!!" + l1="# FAIL on LND on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/lnd.install.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -85,7 +85,7 @@ if [ "${cl}" != "${choice}" ]; then # generate wallet from seedwords /home/admin/config.scripts/cl.hsmtool.sh new $CHAIN else - l1="# !!! FAIL on CL on $CHAIN install !!!" + l1="# FAIL on CL on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl.install.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -110,7 +110,7 @@ if [ "${rtlWebinterface}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.rtl.sh menu lnd $CHAIN else - l1="# !!! FAIL on RTL for LND $CHAIN install !!!" + l1="# FAIL on RTL for LND $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.rtl.sh on lnd $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -135,7 +135,7 @@ if [ "${crtlWebinterface}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.rtl.sh menu cl $CHAIN else - l1="!!! FAIL on RTL for CL $CHAIN install !!!" + l1="# FAIL on RTL for CL $CHAIN install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.rtl.sh on cl $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -157,7 +157,7 @@ if [ "${sparko}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then /home/admin/config.scripts/cl-plugin.sparko.sh menu $CHAIN else - l1="# !!! FAIL on Sparko on $CHAIN install !!!" + l1="# FAIL on Sparko on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl-plugin.sparko.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -179,7 +179,7 @@ if [ "${spark}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then /home/admin/config.scripts/cl.spark.sh menu $CHAIN else - l1="# !!! FAIL on Spark Wallet on $CHAIN install !!!" + l1="# FAIL on Spark Wallet on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl.spark.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 diff --git a/home.admin/00parallelTestnetServices.sh b/home.admin/00parallelTestnetServices.sh index 3c751286..6f51ee86 100644 --- a/home.admin/00parallelTestnetServices.sh +++ b/home.admin/00parallelTestnetServices.sh @@ -60,7 +60,7 @@ if [ "${tlnd}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then echo "# Successfully installed LND on $CHAIN" else - l1="# !!! FAIL on LND on $CHAIN install !!!" + l1="# FAIL on LND on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/lnd.install.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -82,7 +82,7 @@ if [ "${tcl}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then echo "# Successfully installed CL on $CHAIN" else - l1="# !!! FAIL on CL on $CHAIN install !!!" + l1="# FAIL on CL on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl.install.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -107,7 +107,7 @@ if [ "${trtlWebinterface}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.rtl.sh menu lnd $CHAIN else - l1="# !!! FAIL on RTL for LND $CHAIN install !!!" + l1="# FAIL on RTL for LND $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.rtl.sh on lnd $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -132,7 +132,7 @@ if [ "${tcrtlWebinterface}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.rtl.sh menu cl $CHAIN else - l1="!!! FAIL on RTL for CL $CHAIN install !!!" + l1="# FAIL on RTL for CL $CHAIN install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.rtl.sh on cl $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -154,7 +154,7 @@ if [ "${tsparko}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then /home/admin/config.scripts/cl-plugin.sparko.sh menu $CHAIN else - l1="# !!! FAIL on Sparko on $CHAIN install !!!" + l1="# FAIL on Sparko on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl-plugin.sparko.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -176,7 +176,7 @@ if [ "${tspark}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then /home/admin/config.scripts/cl.spark.sh menu $CHAIN else - l1="# !!! FAIL on Spark Wallet on $CHAIN install !!!" + l1="# FAIL on Spark Wallet on $CHAIN install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl.spark.sh on $CHAIN" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index 5d9e7fe9..65a3a299 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -226,7 +226,7 @@ do # output error message echo "" - echo "!!! FAIL !!! SOMETHING WENT WRONG:" + echo "# FAIL # SOMETHING WENT WRONG:" echo "${error}" # check if its possible to give background info on the error @@ -240,7 +240,7 @@ do fi # basic info on error - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "#################" echo "To try upload of channel.backup again:" echo "MAINMENU > REPAIR > REPAIR-LND > RETRYSCB" echo diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index 5dbf98cb..9f17aeca 100755 --- a/home.admin/00settingsMenuServices.sh +++ b/home.admin/00settingsMenuServices.sh @@ -116,7 +116,7 @@ if [ "${rtlWebinterface}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.rtl.sh menu lnd mainnet else - l1="!!! FAIL on RTL lnd install !!!" + l1="# FAIL on RTL lnd install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.rtl.sh on lnd mainnet" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -141,7 +141,7 @@ if [ "${crtlWebinterface}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.rtl.sh menu cl mainnet else - l1="!!! FAIL on RTL C-Lightning install !!!" + l1="# FAIL on RTL C-Lightning install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.rtl.sh on cl mainnet" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -169,7 +169,7 @@ When finished use the new 'EXPLORE' entry in Main Menu for more info.\n " 14 50 needsReboot=1 else - l1="!!! FAIL on BTC-RPC-Explorer install !!!" + l1="# FAIL on BTC-RPC-Explorer install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.btc-rpc-explorer.sh on" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -192,7 +192,7 @@ if [ "${specter}" != "${choice}" ]; then sudo systemctl start specter /home/admin/config.scripts/bonus.specter.sh menu else - l1="!!! FAIL on Specter Desktop install !!!" + l1="# FAIL on Specter Desktop install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.specter.sh on" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -230,7 +230,7 @@ When finished use the new 'ELECTRS' entry in Main Menu for more info.\n " 14 50 needsReboot=0 else - l1="!!! FAIL on ElectRS install !!!" + l1="# FAIL on ElectRS install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.electrs.sh on" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -363,7 +363,7 @@ if [ "${thunderhub}" != "${choice}" ]; then sleep 10 /home/admin/config.scripts/bonus.thunderhub.sh menu else - l1="!!! FAIL on ThunderHub install !!!" + l1="# FAIL on ThunderHub install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.thunderhub.sh on" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -500,7 +500,7 @@ This can take ~7 hours on a RPi4 with SSD. Monitor the progress on the LCD.\n When finished use the new 'MEMPOOL' entry in Main Menu for more info.\n " 14 50 else - l1="!!! FAIL on Mempool Explorer install !!!" + l1="# FAIL on Mempool Explorer install #" l2="Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/bonus.mempool.sh on" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -570,7 +570,7 @@ if [ "${sparko}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then /home/admin/config.scripts/cl-plugin.sparko.sh menu mainnet else - l1="# !!! FAIL on Sparko on mainnet install !!!" + l1="# FAIL on Sparko on mainnet install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl-plugin.sparko.sh on mainnet" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 @@ -592,7 +592,7 @@ if [ "${spark}" != "${choice}" ]; then if [ ${errorOnInstall} -eq 0 ]; then /home/admin/config.scripts/cl.spark.sh menu mainnet else - l1="# !!! FAIL on Spark Wallet on mainnet install !!!" + l1="# FAIL on Spark Wallet on mainnet install #" l2="# Try manual install on terminal after reboot with:" l3="/home/admin/config.scripts/cl.spark.sh on mainnet" dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65 diff --git a/home.admin/BBcashoutWallet.sh b/home.admin/BBcashoutWallet.sh index 4e89fe82..9e1a714c 100755 --- a/home.admin/BBcashoutWallet.sh +++ b/home.admin/BBcashoutWallet.sh @@ -108,9 +108,9 @@ echo if [ ${#error} -gt 0 ]; then echo "FAIL: $error" echo - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "#################################" echo "FAIL --> Was not able to send transaction (see error above)" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "#################################" else echo "Result: $result" echo diff --git a/home.admin/BBconnectPeer.sh b/home.admin/BBconnectPeer.sh index 9597e12f..87ab3d76 100755 --- a/home.admin/BBconnectPeer.sh +++ b/home.admin/BBconnectPeer.sh @@ -137,9 +137,9 @@ if [ ${win} -eq 1 ]; then echo echo "What's next? --> Open a channel with that node." else - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "FAIL" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "${info}" fi diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh index e9e7928d..621f42e2 100755 --- a/home.admin/BBcreateInvoice.sh +++ b/home.admin/BBcreateInvoice.sh @@ -55,9 +55,9 @@ elif [ $LNTYPE = lnd ];then fi if [ ${openChannels} -eq 0 ]; then echo - echo "!!!!!!!!!!!!!!!!!!!" + echo "#########" echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first." - echo "!!!!!!!!!!!!!!!!!!!" + echo "#########" sleep 3 exit 0 fi @@ -109,9 +109,9 @@ error=$(cat ${_error} 2>/dev/null) #echo "error(${error})" if [ ${#error} -gt 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "FAIL" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "${error}" else if [ $LNTYPE = cl ];then diff --git a/home.admin/BBopenChannel.sh b/home.admin/BBopenChannel.sh index 517ff8d1..a263125b 100755 --- a/home.admin/BBopenChannel.sh +++ b/home.admin/BBopenChannel.sh @@ -191,9 +191,9 @@ error=$(cat ${_error}) #echo "error(${error})" if [ ${#error} -gt 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "FAIL" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "${error}" else echo "******************************" diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh index dd010836..9dc787a1 100755 --- a/home.admin/BBpayInvoice.sh +++ b/home.admin/BBpayInvoice.sh @@ -54,9 +54,9 @@ elif [ $LNTYPE = lnd ];then fi if [ ${openChannels} -eq 0 ]; then echo - echo "!!!!!!!!!!!!!!!!!!!" + echo "#########" echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first." - echo "!!!!!!!!!!!!!!!!!!!" + echo "#########" sleep 3 echo exit 0 @@ -135,10 +135,10 @@ if [ ${resultIsError} -gt 0 ]; then fi if [ ${#error} -gt 0 ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "FAIL" echo "try with a wallet app or the RTL WebGUI (see services)" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + echo "###############" echo "${error}" else echo "${result}" diff --git a/home.admin/XXcleanHDD.sh b/home.admin/XXcleanHDD.sh index 6bd364a2..44320afc 100755 --- a/home.admin/XXcleanHDD.sh +++ b/home.admin/XXcleanHDD.sh @@ -4,7 +4,7 @@ extraParameter="$1" forceParameter="$2" if [ "${extraParameter}" = "-all" ]; then - echo "# !!!! This will DELETE ALL DATA & POSSIBLE FUNDS from the HDD !!!!" + echo "## This will DELETE ALL DATA & POSSIBLE FUNDS from the HDD ##" echo "# Press ENTER to really continue - CTRL+c to CANCEL (last chance)" read key @@ -52,7 +52,7 @@ elif [ "${extraParameter}" = "-blockchain" ]; then else - echo "!!!! This will DELETE your personal data & POSSIBLE FUNDS from the HDD !!!!" + echo "## This will DELETE your personal data & POSSIBLE FUNDS from the HDD ##" echo "--> It will keep Blockchain data - so you dont have to download/copy again." echo "Press ENTER to really continue - CTRL+c to CANCEL (last chance)" read key diff --git a/home.admin/XXcopyStation.sh b/home.admin/XXcopyStation.sh index 7a868b59..c7980e38 100755 --- a/home.admin/XXcopyStation.sh +++ b/home.admin/XXcopyStation.sh @@ -187,7 +187,7 @@ do size=$(lsblk -o NAME,SIZE -b | grep "^${detectedDrive}" | awk '$1=$1' | cut -d " " -f 2) echo "size: ${size}" if [ ${size} -lt 900000000000 ]; then - echo "!! THE HDD/SSD IS TOO SMALL <900GB - use at least 1TB" + echo "# THE HDD/SSD IS TOO SMALL <900GB - use at least 1TB" /home/admin/_cache.sh set message "HDD smaller than 1TB: ${detectedDrive}" echo sleep 10 diff --git a/home.admin/_background.scan.sh b/home.admin/_background.scan.sh index d67aa0f7..0853f9e8 100755 --- a/home.admin/_background.scan.sh +++ b/home.admin/_background.scan.sh @@ -441,7 +441,7 @@ do fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi @@ -472,7 +472,7 @@ do /home/admin/_cache.sh set btc_default_port "${btc_port}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi @@ -495,7 +495,7 @@ do /home/admin/_cache.sh set btc_default_mempool_transactions "${btc_mempool_transactions}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi fi @@ -598,7 +598,7 @@ do /home/admin/_cache.sh set ln_default_alias "${ln_lnd_alias}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi @@ -662,7 +662,7 @@ do /home/admin/_cache.sh set ln_default_recovery_done "${ln_lnd_recovery_done}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi @@ -697,7 +697,7 @@ do /home/admin/_cache.sh set ln_default_wallet_channels_pending "${ln_lnd_wallet_channels_pending}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi @@ -726,7 +726,7 @@ do /home/admin/_cache.sh set ln_default_fees_total "${ln_lnd_fees_total}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi fi @@ -878,7 +878,7 @@ do /home/admin/_cache.sh set ln_default_recovery_done "${ln_cl_recovery_done}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi @@ -913,7 +913,7 @@ do /home/admin/_cache.sh set ln_default_wallet_channels_pending "${ln_cl_wallet_channels_pending}" fi else - echo "!! ERROR --> ${error}" + echo "# ERROR --> ${error}" fi fi fi diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index 36495ad8..b3360660 100755 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -172,12 +172,12 @@ sleep 5 echo "*** Checking Log Size ***" logsMegaByte=$(sudo du -c -m /var/log | grep "total" | awk '{print $1;}') if [ ${logsMegaByte} -gt 1000 ]; then - echo "WARN !! Logs /var/log in are bigger then 1GB" >> $logFile + echo "WARN # Logs /var/log in are bigger then 1GB" >> $logFile # dont delete directories - can make services crash sudo rm /var/log/* sudo service rsyslog restart /home/admin/_cache.sh set message "WARNING: /var/log/ >1GB" - echo "WARN !! Logs in /var/log in were bigger then 1GB and got emergency delete to prevent fillup." >> $logFile + echo "WARN # Logs in /var/log in were bigger then 1GB and got emergency delete to prevent fillup." >> $logFile echo "If you see this in the logs please report to the GitHub issues, so LOG config needs to be optimized." >> $logFile sleep 10 else @@ -259,9 +259,9 @@ if [ "${needsExpansion}" == "1" ] && [ "${fsexpanded}" == "0" ]; then systemInitReboot=1 /home/admin/_cache.sh set message "FSEXPAND" elif [ "${tooSmall}" == "1" ]; then - echo "!!! FAIL !!!!!!!!!!!!!!!!!!!!" >> $logFile + echo "# FAIL #######" >> $logFile echo "SDCARD TOO SMALL 16GB minimum" >> $logFile - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $logFile + echo "##############" >> $logFile /home/admin/_cache.sh set state "sdtoosmall" echo "System stopped. Please cut power." >> $logFile sleep 6000 diff --git a/home.admin/config.scripts/bitcoin.install.sh b/home.admin/config.scripts/bitcoin.install.sh index a42f5931..60f42f7f 100644 --- a/home.admin/config.scripts/bitcoin.install.sh +++ b/home.admin/config.scripts/bitcoin.install.sh @@ -29,7 +29,7 @@ if [ "$1" = "install" ]; then # receive signer key if ! gpg --keyserver hkp://keyserver.ubuntu.com --recv-key "71A3 B167 3540 5025 D447 E8F2 7481 0B01 2346 C9A6" then - echo "!!! FAIL !!! Couldn't download Wladimir J. van der Laan's PGP pubkey" + echo "# FAIL # Couldn't download Wladimir J. van der Laan's PGP pubkey" exit 1 fi @@ -45,7 +45,7 @@ if [ "$1" = "install" ]; then echo "correctKey(${correctKey})" if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then echo - echo "!!! BUILD FAILED --> PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" exit 1 else echo @@ -73,7 +73,7 @@ if [ "$1" = "install" ]; then sudo -u admin wget https://bitcoincore.org/bin/bitcoin-core-${bitcoinVersion}/${binaryName} fi if [ ! -f "./${binaryName}" ]; then - echo "!!! FAIL !!! Could not download the BITCOIN BINARY" + echo "# FAIL # Could not download the BITCOIN BINARY" exit 1 else @@ -85,7 +85,7 @@ if [ "$1" = "install" ]; then echo "Valid SHA256 checksum should be: ${bitcoinSHA256}" echo "Downloaded binary SHA256 checksum: ${binaryChecksum}" if [ "${binaryChecksum}" != "${bitcoinSHA256}" ]; then - echo "!!! FAIL !!! Downloaded BITCOIN BINARY not matching SHA256 checksum: ${bitcoinSHA256}" + echo "# FAIL # Downloaded BITCOIN BINARY not matching SHA256 checksum: ${bitcoinSHA256}" rm -v ./${binaryName} exit 1 else @@ -106,7 +106,7 @@ if [ "$1" = "install" ]; then installed=$(sudo -u admin bitcoind --version | grep "${bitcoinVersion}" -c) if [ ${installed} -lt 1 ]; then echo - echo "!!! BUILD FAILED --> Was not able to install bitcoind version(${bitcoinVersion})" + echo "# BUILD FAILED --> Was not able to install bitcoind version(${bitcoinVersion})" exit 1 fi if [ "$(alias | grep -c "alias bitcoinlog")" -eq 0 ];then diff --git a/home.admin/config.scripts/bitcoin.update.sh b/home.admin/config.scripts/bitcoin.update.sh index 2c2051c2..81d83a12 100755 --- a/home.admin/config.scripts/bitcoin.update.sh +++ b/home.admin/config.scripts/bitcoin.update.sh @@ -168,7 +168,7 @@ if [ "${mode}" = "tested" ]||[ "${mode}" = "reckless" ]||[ "${mode}" = "custom" if ! gpg --recv-key "$customKey" then echo - echo "!!! FAIL !!! Could not download the PGP pubkey" + echo "# FAIL # Could not download the PGP pubkey" echo echo "See the signers of this release:" echo @@ -184,7 +184,7 @@ if [ "${mode}" = "tested" ]||[ "${mode}" = "reckless" ]||[ "${mode}" = "custom" echo "correctKey(${correctKey})" if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then echo - echo "# !!! BUILD FAILED --> PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" exit 1 else echo @@ -197,7 +197,7 @@ if [ "${mode}" = "tested" ]||[ "${mode}" = "reckless" ]||[ "${mode}" = "custom" wget https://bitcoincore.org/bin/bitcoin-core-${pathVersion}/${binaryName} if [ ! -f "./${binaryName}" ] then - echo "# !!! FAIL !!! Downloading BITCOIN BINARY did not succeed." + echo "# FAIL # Downloading BITCOIN BINARY did not succeed." exit 1 fi @@ -207,7 +207,7 @@ if [ "${mode}" = "tested" ]||[ "${mode}" = "reckless" ]||[ "${mode}" = "custom" if [ "${checksumTest}" -eq 0 ]; then # get the sha256 value for the corresponding platform from signed hash sum file bitcoinSHA256=$(grep -i "${binaryName}}" SHA256SUMS | cut -d " " -f1) - echo "!!! FAIL !!! Downloaded BITCOIN BINARY CHECKSUM:" + echo "# FAIL # Downloaded BITCOIN BINARY CHECKSUM:" echo "$(sha256sum ${binaryName})" echo "NOT matching SHA256 checksum:" echo "${bitcoinSHA256}" @@ -241,7 +241,7 @@ if [ "${mode}" = "tested" ]||[ "${mode}" = "reckless" ]||[ "${mode}" = "custom" installed=$(bitcoind --version | grep "${bitcoinVersion}" -c) if [ ${installed} -lt 1 ]; then echo - echo "# !!! BUILD FAILED --> Was not able to install bitcoind version(${bitcoinVersion})" + echo "# BUILD FAILED --> Was not able to install bitcoind version(${bitcoinVersion})" exit 1 fi diff --git a/home.admin/config.scripts/blitz.datadrive.sh b/home.admin/config.scripts/blitz.datadrive.sh index 2d0d96bb..ccac3734 100755 --- a/home.admin/config.scripts/blitz.datadrive.sh +++ b/home.admin/config.scripts/blitz.datadrive.sh @@ -1130,7 +1130,7 @@ if [ "$1" = "raid" ] && [ "$2" = "on" ]; then if [ ${usbdevBTRFS} -eq 1 ]; then # edge case: already contains BTRFS data # TODO: once implemented -> also make sure that dev1 is named "DATASTORE" and if 2nd is other -> format and add as raid - >&2 echo "# ERROR: !! NOT IMPLEMENTED YET -> devices seem contain old data" + >&2 echo "# ERROR: # NOT IMPLEMENTED YET -> devices seem contain old data" >&2 echo "# if you dont care about that data: format on other computer with FAT" echo "error='old data on dev'" exit 1 diff --git a/home.admin/config.scripts/blitz.docker.sh b/home.admin/config.scripts/blitz.docker.sh index 3a304c13..5a2ce1ce 100644 --- a/home.admin/config.scripts/blitz.docker.sh +++ b/home.admin/config.scripts/blitz.docker.sh @@ -62,9 +62,9 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo echo "### 2) INSTALL docker compose ###" - # # add docker compose + # add docker compose # sudo pip3 install docker-compose - # # add bash completion https://docs.docker.com/compose/completion/ + # add bash completion https://docs.docker.com/compose/completion/ # sudo curl \ # -L https://raw.githubusercontent.com/docker/compose/1.29.0/contrib/completion/bash/docker-compose \ # -o /etc/bash_completion.d/docker-compose diff --git a/home.admin/config.scripts/blitz.error.sh b/home.admin/config.scripts/blitz.error.sh index 9195f850..2d3ee1c6 100755 --- a/home.admin/config.scripts/blitz.error.sh +++ b/home.admin/config.scripts/blitz.error.sh @@ -50,16 +50,16 @@ chown admin:admin ${filename} # B) write error to std outs >&2 echo "${errorReport} --> ${filename}" -echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +echo "##################" echo "${errorReport}" -echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +echo "##################" # C) write error report to given logfile (optional) logfile=$6 if [ "${logfile}" != "" ]; then - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ${logFile} + echo "##################" >> ${logFile} echo "${errorReport}" >> ${logFile} - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ${logFile} + echo "##################" >> ${logFile} fi # on serial calls make sure that at least a second is between error reports diff --git a/home.admin/config.scripts/blitz.git-verify.sh b/home.admin/config.scripts/blitz.git-verify.sh index fe97d2d0..e3a6d9ab 100644 --- a/home.admin/config.scripts/blitz.git-verify.sh +++ b/home.admin/config.scripts/blitz.git-verify.sh @@ -36,7 +36,7 @@ gpg --import --import-options show-only /var/cache/raspiblitz/pgp_keys_${PGPsign fingerprint=$(gpg --show-keys /var/cache/raspiblitz/pgp_keys_${PGPsigner}.asc 2>/dev/null | grep "${PGPpubkeyFingerprint}" -c) if [ "${fingerprint}" -lt 1 ]; then echo - echo "# !!! WARNING --> the PGP fingerprint is not as expected for ${PGPsigner}" >&2 + echo "# WARNING --> the PGP fingerprint is not as expected for ${PGPsigner}" >&2 echo "# Should contain PGP: ${PGPpubkeyFingerprint}" >&2 echo "# Exiting" >&2 exit 7 @@ -70,7 +70,7 @@ echo "# correctKey(${correctKey})" if [ "${correctKey}" -lt 1 ] || [ "${goodSignature}" -lt 1 ]; then echo - echo "# !!! BUILD FAILED --> PGP verification not OK / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> PGP verification not OK / signature(${goodSignature}) verify(${correctKey})" exit 1 else echo diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh index 06a56ca1..1a101ab2 100755 --- a/home.admin/config.scripts/bonus.btcpayserver.sh +++ b/home.admin/config.scripts/bonus.btcpayserver.sh @@ -396,7 +396,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # check binary is was not manipulated (checksum test) actualChecksum=$(sha512sum /home/btcpay/${dotNetName} | cut -d " " -f1) if [ "${actualChecksum}" != "${dotNetChecksum}" ]; then - echo "# !!! FAIL !!! Downloaded ${dotNetName} not matching SHA512 checksum: ${dotNetChecksum}" + echo "# FAIL # Downloaded ${dotNetName} not matching SHA512 checksum: ${dotNetChecksum}" exit 1 fi diff --git a/home.admin/config.scripts/bonus.chantools.sh b/home.admin/config.scripts/bonus.chantools.sh index ee14ea82..91e006d6 100644 --- a/home.admin/config.scripts/bonus.chantools.sh +++ b/home.admin/config.scripts/bonus.chantools.sh @@ -44,7 +44,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then isAARCH64=$(uname -m | grep -c 'aarch64') isX86_64=$(uname -m | grep -c 'x86_64') if [ ${isARM} -eq 0 ] && [ ${isAARCH64} -eq 0 ] && [ ${isX86_64} -eq 0 ] ; then - echo "# !!! FAIL !!!" + echo "# FAIL #" echo "# Can only build on arm, aarch64 or x86_64 not on:" uname -m exit 1 @@ -80,7 +80,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then sudo -u admin wget --no-check-certificate -N -O "${downloadDir}/pgp_keys.asc" ${PGPpkeys} binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1) if [ "${binaryChecksum}" != "${SHA256}" ]; then - echo "# !!! FAIL !!! Downloaded Channel Tools BINARY not matching SHA256 checksum: ${SHA256}" + echo "# FAIL # Downloaded Channel Tools BINARY not matching SHA256 checksum: ${SHA256}" exit 1 fi @@ -89,7 +89,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then fingerprint=$(sudo gpg --show-keys "${downloadDir}/pgp_keys.asc" 2>/dev/null | grep "${PGPcheck}" -c) if [ ${fingerprint} -lt 1 ]; then echo - echo "# !!! BUILD WARNING --> Channel Tools PGP author not as expected" + echo "# BUILD WARNING --> Channel Tools PGP author not as expected" echo "# Should contain PGP: ${PGPcheck}" echo "# PRESS ENTER to TAKE THE RISK if you think all is OK" read key @@ -107,7 +107,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "# correctKey(${correctKey})" if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then echo - echo "# !!! BUILD FAILED --> Channel Tools PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> Channel Tools PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" exit 1 fi @@ -118,7 +118,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then installed=$(sudo -u bitcoin chantools --version) if [ ${#installed} -eq 0 ]; then echo - echo "# !!! BUILD FAILED --> Was not able to install Channel Tools" + echo "# BUILD FAILED --> Was not able to install Channel Tools" exit 1 fi # setting value in raspi blitz config diff --git a/home.admin/config.scripts/bonus.faraday.sh b/home.admin/config.scripts/bonus.faraday.sh index 1ebfd316..fe3f989b 100755 --- a/home.admin/config.scripts/bonus.faraday.sh +++ b/home.admin/config.scripts/bonus.faraday.sh @@ -1,6 +1,6 @@ #!/bin/bash -# !! NOTICE: Faraday is now prt of the 'bonus.lit.sh' bundle +# NOTICE: Faraday is now prt of the 'bonus.lit.sh' bundle # this single install script will still be available for now # but main focus for the future development should be on LIT @@ -8,7 +8,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo "Bonus App: faraday -> https://github.com/lightninglabs/faraday" echo "lnd.faraday.sh [status|on|off]" - echo "!! DEPRECATED use instead: bonus.lit.sh" + echo "# DEPRECATED use instead: bonus.lit.sh" exit 1 fi diff --git a/home.admin/config.scripts/bonus.go.sh b/home.admin/config.scripts/bonus.go.sh index d622099a..5a6d75f8 100755 --- a/home.admin/config.scripts/bonus.go.sh +++ b/home.admin/config.scripts/bonus.go.sh @@ -30,7 +30,7 @@ case "$1" in printf %s"\n*** Installing Go v${goVersion} for ${goOSversion} \n***" wget https://dl.google.com/go/go${goVersion}.linux-${goOSversion}.tar.gz -P ${downloadFolder} if [ ! -f "${downloadFolder}/go${goVersion}.linux-${goOSversion}.tar.gz" ]; then - printf "!!! FAIL !!! Download failed.\n" + printf "# FAIL # Download failed.\n" rm -fv go${goVersion}.linux-${goOSversion}.tar.gz* exit 1 fi diff --git a/home.admin/config.scripts/bonus.itchysats.sh b/home.admin/config.scripts/bonus.itchysats.sh index 0e1cbee2..65c6d252 100755 --- a/home.admin/config.scripts/bonus.itchysats.sh +++ b/home.admin/config.scripts/bonus.itchysats.sh @@ -154,7 +154,7 @@ downloadBinary() { isAARCH64=$(uname -m | grep -c 'aarch64') isX86_64=$(uname -m | grep -c 'x86_64') if [ ${isAARCH64} -eq 0 ] && [ ${isX86_64} -eq 0 ] ; then - echo "# !!! FAIL !!!" + echo "# FAIL #" echo "# Can only build on aarch64 or x86_64 not on:" uname -m exit 1 @@ -171,7 +171,7 @@ downloadBinary() { sudo -u ${APPID} wget -N ${GITHUB_REPO}/releases/download/"${VERSION}"/"${archiveName}" checkDownload=$(ls "${archiveName}" 2>/dev/null | grep -c "${archiveName}") if [ "${checkDownload}" -eq 0 ]; then - echo "# !!! FAIL !!!" + echo "# FAIL #" echo "# Downloading the binary failed" exit 1 fi @@ -187,7 +187,7 @@ downloadBinary() { sudo -u ${APPID} "${ITCHYSATS_BIN_DIR}" --help 1> /dev/null exitstatus=$? if [ "${exitstatus}" -ne 0 ]; then - echo "# !!! FAIL !!!" + echo "# FAIL #" echo "# install failed" exit 1 fi diff --git a/home.admin/config.scripts/bonus.lit.sh b/home.admin/config.scripts/bonus.lit.sh index 058a8df9..5533b647 100644 --- a/home.admin/config.scripts/bonus.lit.sh +++ b/home.admin/config.scripts/bonus.lit.sh @@ -149,7 +149,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then isAARCH64=$(uname -m | grep -c 'aarch64') isX86_64=$(uname -m | grep -c 'x86_64') if [ ${isARM} -eq 0 ] && [ ${isAARCH64} -eq 0 ] && [ ${isX86_64} -eq 0 ]; then - echo "!!! FAIL !!!" + echo "# FAIL #" echo "Can only build on ARM, aarch64, x86_64 or i386 not on:" uname -m exit 1 @@ -186,7 +186,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then wget --no-check-certificate ${PGPpkeys} binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1) if [ "${binaryChecksum}" != "${SHA256}" ]; then - echo "!!! FAIL !!! Downloaded LiT BINARY not matching SHA256 checksum: ${SHA256}" + echo "# FAIL # Downloaded LiT BINARY not matching SHA256 checksum: ${SHA256}" exit 1 fi @@ -196,7 +196,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then | grep "${PGPcheck}" -c) if [ ${fingerprint} -lt 1 ]; then echo "" - echo "!!! BUILD WARNING --> LiT PGP author not as expected" + echo "# BUILD WARNING --> LiT PGP author not as expected" echo "Should contain PGP: ${PGPcheck}" echo "PRESS ENTER to TAKE THE RISK if you think all is OK" read key @@ -210,7 +210,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "correctKey(${correctKey})" if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then echo "" - echo "!!! BUILD FAILED --> LND PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> LND PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" exit 1 fi ########### diff --git a/home.admin/config.scripts/bonus.lndmanage.sh b/home.admin/config.scripts/bonus.lndmanage.sh index 42661a00..4612f59a 100755 --- a/home.admin/config.scripts/bonus.lndmanage.sh +++ b/home.admin/config.scripts/bonus.lndmanage.sh @@ -79,8 +79,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # check if install was successful if [ $(python3 -m pip list | grep -c "lndmanage") -eq 0 ]; then echo - echo "#!! FAIL --> Was not able to install LNDMANAGE" - echo "#!! Maybe because of internet network issues - try again later." + echo "## FAIL --> Was not able to install LNDMANAGE" + echo "## Maybe because of internet network issues - try again later." sudo rm -rf /home/admin/lndmanage sleep 5 exit 1 diff --git a/home.admin/config.scripts/bonus.loop.sh b/home.admin/config.scripts/bonus.loop.sh index 24d7b285..64763f38 100755 --- a/home.admin/config.scripts/bonus.loop.sh +++ b/home.admin/config.scripts/bonus.loop.sh @@ -1,6 +1,6 @@ #!/bin/bash -# !! NOTICE: Faraday is now part of the 'bonus.lit.sh' bundle +# NOTICE: Faraday is now part of the 'bonus.lit.sh' bundle # this single install script will still be available for now # but main focus for the future development should be on LIT @@ -11,7 +11,7 @@ pinnedVersion="v0.15.0-beta" if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo "config script to switch the Lightning Loop Service on,off or update" echo "bonus.loop.sh [on|off|menu|update]" - echo "!! DEPRECATED use instead: bonus.lit.sh" + echo "# DEPRECATED use instead: bonus.lit.sh" exit 1 fi diff --git a/home.admin/config.scripts/bonus.pool.sh b/home.admin/config.scripts/bonus.pool.sh index b3c103cd..ae75f959 100644 --- a/home.admin/config.scripts/bonus.pool.sh +++ b/home.admin/config.scripts/bonus.pool.sh @@ -1,6 +1,6 @@ #!/bin/bash -# !! NOTICE: Pool is now part of the 'bonus.lit.sh' bundle +# NOTICE: Pool is now part of the 'bonus.lit.sh' bundle # this single install script will still be available for now # but main focus for the future development should be on LIT @@ -82,7 +82,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then isAARCH64=$(uname -m | grep -c 'aarch64') isX86_64=$(uname -m | grep -c 'x86_64') if [ ${isARM} -eq 0 ] && [ ${isAARCH64} -eq 0 ] && [ ${isX86_64} -eq 0 ]; then - echo "!!! FAIL !!!" + echo "# FAIL #" echo "Can only build on ARM, aarch64, x86_64 or i386 not on:" uname -m exit 1 @@ -117,7 +117,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then #wget --no-check-certificate ${PGPpkeys} binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1) if [ "${binaryChecksum}" != "${SHA256}" ]; then - echo "!!! FAIL !!! Downloaded Pool BINARY not matching SHA256 checksum: ${SHA256}" + echo "# FAIL # Downloaded Pool BINARY not matching SHA256 checksum: ${SHA256}" exit 1 fi @@ -127,7 +127,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then | grep "${PGPcheck}" -c) if [ ${fingerprint} -lt 1 ]; then echo "" - echo "!!! BUILD WARNING --> Pool PGP author not as expected" + echo "# BUILD WARNING --> Pool PGP author not as expected" echo "Should contain PGP: ${PGPcheck}" echo "PRESS ENTER to TAKE THE RISK if you think all is OK" read key @@ -141,7 +141,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "correctKey(${correctKey})" if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then echo "" - echo "!!! BUILD FAILED --> PGP verification failed / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> PGP verification failed / signature(${goodSignature}) verify(${correctKey})" exit 1 fi ########### @@ -159,9 +159,9 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # # sudo -u pool git clone https://github.com/lightninglabs/pool.git || exit 1 # cd /home/pool/pool - # # pin version + # pin version # sudo -u pool git reset --hard $pinnedVersion - # # install to /home/pool/go/bin/ + # install to /home/pool/go/bin/ # sudo -u pool /usr/local/go/bin/go install ./... || exit 1 # sync all macaroons and unix groups for access @@ -272,7 +272,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then exit 0 fi -# # update +# update # if [ "$1" = "update" ]; then # echo "# Updating Pool " # cd /home/pool/pool diff --git a/home.admin/config.scripts/bonus.sphinxrelay.sh b/home.admin/config.scripts/bonus.sphinxrelay.sh index 03376375..14f20862 100755 --- a/home.admin/config.scripts/bonus.sphinxrelay.sh +++ b/home.admin/config.scripts/bonus.sphinxrelay.sh @@ -187,7 +187,7 @@ fi # IMPORTANT: all this needs to work without sudo because will run from systemd as sphinxrelay user if [ "$1" = "write-environment" ]; then - # !! all this needs to run (be called as) user: sphinxrelay + # all this needs to run (be called as) user: sphinxrelay # get basic data from status source <(/home/admin/config.scripts/bonus.sphinxrelay.sh status) diff --git a/home.admin/config.scripts/cl.backup.sh b/home.admin/config.scripts/cl.backup.sh index 47c05b1d..d4ac902f 100644 --- a/home.admin/config.scripts/cl.backup.sh +++ b/home.admin/config.scripts/cl.backup.sh @@ -304,24 +304,24 @@ if [ ${mode} = "cl-import-gui" ]; then echo "PRESS ENTER to continue." read key elif [ "${error}" == "not-found" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There was no upload found in ${defaultUploadPath}" echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "multiple" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There are multiple cl-rescue files in directory ${defaultUploadPath}" echo "Make sure you upload only one tar.gz-file and start again." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "invalid" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "The file uploaded is not a valid (complete upload failed or not correct file)." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry else # create no result file and exit - echo "!! WARNING !! Unknown State (report to devs)" + echo "# WARNING # Unknown State (report to devs)" exit 1 fi diff --git a/home.admin/config.scripts/cl.install.sh b/home.admin/config.scripts/cl.install.sh index b5482bdb..dc2b633d 100644 --- a/home.admin/config.scripts/cl.install.sh +++ b/home.admin/config.scripts/cl.install.sh @@ -93,7 +93,7 @@ if [ "$1" = "install" ]; then # fingerprint=$(gpg "pgp_keys.asc" 2>/dev/null | grep "${PGPpubkeyFingerprint}" -c) # if [ ${fingerprint} -lt 1 ]; then # echo -# echo "!!! WARNING --> the PGP fingerprint is not as expected for ${PGPsigner}" +# echo "# WARNING --> the PGP fingerprint is not as expected for ${PGPsigner}" # echo "Should contain PGP: ${PGPpubkeyFingerprint}" # echo "PRESS ENTER to TAKE THE RISK if you think all is OK" # read key @@ -111,7 +111,7 @@ if [ "$1" = "install" ]; then # echo "correctKey(${correctKey})" # if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then # echo -# echo "!!! DOWNLOAD FAILED --> PGP verification not OK / signature(${goodSignature}) verify(${correctKey})" +# echo "# DOWNLOAD FAILED --> PGP verification not OK / signature(${goodSignature}) verify(${correctKey})" # exit 1 # else # echo @@ -128,7 +128,7 @@ if [ "$1" = "install" ]; then # echo "goodHash(${goodHash})" # if [ ${goodHash} -lt 1 ]; then # echo -# echo "!!! BUILD FAILED --> Hash check not OK" +# echo "# BUILD FAILED --> Hash check not OK" # exit 1 # else # echo @@ -162,14 +162,14 @@ if [ "$1" = "install" ]; then installed=$(sudo -u bitcoin lightning-cli --version) if [ ${#installed} -eq 0 ]; then echo - echo "!!! BUILD FAILED --> Was not able to install Core Lightning" + echo "# BUILD FAILED --> Was not able to install Core Lightning" exit 1 fi correctVersion=$(echo "${installed}" | grep -c "${CLVERSION:1}") if [ "${correctVersion}" -eq 0 ]; then echo - echo "!!! BUILD FAILED --> installed Core Lightning is not version ${CLVERSION}" + echo "# BUILD FAILED --> installed Core Lightning is not version ${CLVERSION}" sudo -u bitcoin lightning-cli --version exit 1 fi diff --git a/home.admin/config.scripts/lnd.backup.sh b/home.admin/config.scripts/lnd.backup.sh index db73f77e..976875fc 100755 --- a/home.admin/config.scripts/lnd.backup.sh +++ b/home.admin/config.scripts/lnd.backup.sh @@ -312,24 +312,24 @@ if [ ${mode} = "lnd-import-gui" ]; then echo "PRESS ENTER to continue." read key elif [ "${error}" == "not-found" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There was no upload found in ${defaultUploadPath}" echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "multiple" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There are multiple lnd-rescue files in directory ${defaultUploadPath}" echo "Make sure you upload only one tar.gz-file and start again." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "invalid" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "The file uploaded is not a valid (complete upload failed or not correct file)." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry else # create no result file and exit - echo "!! WARNING !! Unknown State (report to devs)" + echo "# WARNING # Unknown State (report to devs)" exit 1 fi @@ -505,23 +505,23 @@ if [ ${mode} = "scb-import-gui" ]; then echo "PRESS ENTER to continue." read key elif [ "${error}" == "not-found" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There was no upload found in ${defaultUploadPath}" echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "multiple" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There are multiple lnd-rescue files in directory ${defaultUploadPath}" echo "Make sure you upload only one tar.gz-file and start again." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "invalid" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "The file uploaded is not a valid (complete upload failed or not correct file)." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry else - echo "!! WARNING !! Unknown State (report to devs)" + echo "# WARNING # Unknown State (report to devs)" exit 1 fi diff --git a/home.admin/config.scripts/lnd.initwallet.py b/home.admin/config.scripts/lnd.initwallet.py index 51754c98..e822f216 100755 --- a/home.admin/config.scripts/lnd.initwallet.py +++ b/home.admin/config.scripts/lnd.initwallet.py @@ -35,7 +35,7 @@ else: def new(stub, wallet_password="", seed_entropy=None): if seed_entropy: # provide 16-bytes of static data to get reproducible seeds for TESTING!) - print("WARNING: Use this for testing only!!") + print("WARNING: Use this for testing only") request = lnrpc.GenSeedRequest(seed_entropy=seed_entropy) else: request = lnrpc.GenSeedRequest() diff --git a/home.admin/config.scripts/lnd.install.sh b/home.admin/config.scripts/lnd.install.sh index 2c6531cc..951ac34a 100644 --- a/home.admin/config.scripts/lnd.install.sh +++ b/home.admin/config.scripts/lnd.install.sh @@ -3,7 +3,7 @@ # "*** LND ***" ## based on https://raspibolt.github.io/raspibolt/raspibolt_40_lnd.html#lightning-lnd ## see LND releases: https://github.com/lightningnetwork/lnd/releases -## !!!! If you change here - make sure to also change interims version in lnd.update.sh !!! +### If you change here - make sure to also change interims version in lnd.update.sh #! lndVersion="0.15.0-beta" # olaoluwa @@ -105,7 +105,7 @@ if [ "$1" = "install" ] ; then fingerprint=$(sudo gpg --show-keys "pgp_keys.asc" 2>/dev/null | grep "${PGPcheck}" -c) if [ ${fingerprint} -lt 1 ]; then echo "" - echo "!!! BUILD WARNING --> LND PGP author not as expected" + echo "# BUILD WARNING --> LND PGP author not as expected" echo "Should contain PGP: ${PGPcheck}" echo "PRESS ENTER to TAKE THE RISK if you think all is OK" read key @@ -119,7 +119,7 @@ if [ "$1" = "install" ] ; then echo "correctKey(${correctKey})" if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then echo - echo "!!! BUILD FAILED --> LND PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" + echo "# BUILD FAILED --> LND PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})" exit 1 else echo @@ -163,7 +163,7 @@ if [ "$1" = "install" ] ; then echo "Downloaded binary SHA256 checksum: ${binaryChecksum}" checksumCorrect=$(echo "${lndSHA256}" | grep -c "${binaryChecksum}") if [ "${checksumCorrect}" != "1" ]; then - echo "!!! FAIL !!! Downloaded LND BINARY not matching SHA256 checksum in manifest: ${lndSHA256}" + echo "# FAIL # Downloaded LND BINARY not matching SHA256 checksum in manifest: ${lndSHA256}" rm -v ./${binaryName} exit 1 else @@ -183,14 +183,14 @@ if [ "$1" = "install" ] ; then installed=$(sudo -u admin lnd --version) if [ ${#installed} -eq 0 ]; then echo - echo "!!! BUILD FAILED --> Was not able to install LND" + echo "# BUILD FAILED --> Was not able to install LND" exit 1 fi correctVersion=$(sudo -u admin lnd --version | grep -c "${lndVersion}") if [ ${correctVersion} -eq 0 ]; then echo "" - echo "!!! BUILD FAILED --> installed LND is not version ${lndVersion}" + echo "# BUILD FAILED --> installed LND is not version ${lndVersion}" sudo -u admin lnd --version exit 1 fi @@ -422,7 +422,7 @@ alias ${netprefix}lndconf=\"sudo nano /home/bitcoin/.lnd/${netprefix}lnd.conf\"\ source <(sudo /home/admin/config.scripts/lnd.initwallet.py new ${CHAIN} ${passwordC}) if [ "${err}" != "" ]; then clear - echo "# !!! LND ${CHAIN} wallet creation failed" + echo "# LND ${CHAIN} wallet creation failed" echo "# ${err}" echo "# press ENTER to continue" read key diff --git a/home.admin/config.scripts/tor.network.sh b/home.admin/config.scripts/tor.network.sh index c3720aa9..2f68fc83 100755 --- a/home.admin/config.scripts/tor.network.sh +++ b/home.admin/config.scripts/tor.network.sh @@ -98,7 +98,7 @@ case "$1" in # make sure the network was set (by sourcing raspiblitz.conf) if [ ${#network} -eq 0 ]; then - echo "!! FAIL - unknown network due to missing /mnt/hdd/raspiblitz.conf" + echo "# FAIL - unknown network due to missing /mnt/hdd/raspiblitz.conf" echo "# switching Tor config on for RaspiBlitz services is just possible after basic hdd/ssd setup" echo "# but with new 'Tor by default' basic Tor socks will already be available from the start" exit 1 diff --git a/home.admin/setup.scripts/dialogMigration.sh b/home.admin/setup.scripts/dialogMigration.sh index c9671b65..15bdbb1b 100755 --- a/home.admin/setup.scripts/dialogMigration.sh +++ b/home.admin/setup.scripts/dialogMigration.sh @@ -68,24 +68,24 @@ if [ "${migrationOS}" == "raspiblitz" ]; then echo "PRESS ENTER to continue." read key elif [ "${error}" == "not-found" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There was no upload found in ${defaultUploadPath}" echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "multiple" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "There are multiple lnd-rescue files in directory ${defaultUploadPath}" echo "Make sure you upload only one tar.gz-file and start again." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry elif [ "${error}" == "invalid" ]; then - echo "!! WARNING !!" + echo "# WARNING #" echo "The file uploaded is not a valid (complete upload failed or not correct file)." echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel" read keyRetry else # create no result file and exit - echo "!! WARNING !! Unknown State (report to devs) error(${error})" + echo "# WARNING # Unknown State (report to devs) error(${error})" exit 1 fi