diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index 699af001a..07b938f25 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -411,7 +411,8 @@ fi # show JoinMarket stats in place of the LND URI only if the Yield Generator is running source /home/joinmarket/joinin.conf 2>/dev/null if [ "${joinmarket}" = "on" ] && [ $(sudo -u joinmarket pgrep -f "python yg-privacyenhanced.py $YGwallet --wallet-password-stdin" 2>/dev/null | wc -l) -gt 2 ]; then - JMstats=$(mktemp 2>/dev/null) + trap 'rm -f "$JMstats"' EXIT + JMstats=$(mktemp -p /dev/shm) sudo -u joinmarket /home/joinmarket/info.stats.sh > $JMstats JMstatsL1=$(sed -n 1p < "$JMstats") JMstatsL2=$(sed -n 2p < "$JMstats") diff --git a/home.admin/98repairMenu.sh b/home.admin/98repairMenu.sh index 7b1cd4293..48f16de60 100755 --- a/home.admin/98repairMenu.sh +++ b/home.admin/98repairMenu.sh @@ -96,13 +96,13 @@ case $CHOICE in result="" while [ ${#result} -eq 0 ] do + trap 'rm -f "$_temp"' EXIT _temp=$(mktemp -p /dev/shm/) l1="Please enter the new name of your LND node:\n" l2="different name is better for a fresh identity\n" l3="one word, keep characters basic & not too long" dialog --backtitle "RaspiBlitz - Setup (${network}/${chain})" --inputbox "$l1$l2$l3" 13 52 2>$_temp result=$( cat $_temp | tr -dc '[:alnum:]-.' | tr -d ' ' ) - shred -u $_temp echo "processing ..." sleep 3 done diff --git a/home.admin/99clnRepairMenu.sh b/home.admin/99clnRepairMenu.sh index 38bd70ae1..d384dfc49 100644 --- a/home.admin/99clnRepairMenu.sh +++ b/home.admin/99clnRepairMenu.sh @@ -48,25 +48,25 @@ CHOICE=$(dialog --clear \ case $CHOICE in ENCRYPT) - /home/admin/config.scripts/cln.hsmtool.sh encrypt + /home/admin/config.scripts/cln.hsmtool.sh encrypt $CHAIN source /mnt/hdd/raspiblitz.conf ;; DECRYPT) - /home/admin/config.scripts/cln.hsmtool.sh decrypt + /home/admin/config.scripts/cln.hsmtool.sh decrypt $CHAIN source /mnt/hdd/raspiblitz.conf ;; PASSWORD_C) - /home/admin/config.scripts/cln.hsmtool.sh change-password + /home/admin/config.scripts/cln.hsmtool.sh change-password $CHAIN ;; AUTOUNLOCK-ON) - /home/admin/config.scripts/cln.hsmtool.sh autounlock-on + /home/admin/config.scripts/cln.hsmtool.sh autounlock-on $CHAIN ;; AUTOUNLOCK-OFF) - /home/admin/config.scripts/cln.hsmtool.sh autounlock-off + /home/admin/config.scripts/cln.hsmtool.sh autounlock-off $CHAIN ;; BACKUP) @@ -96,7 +96,7 @@ case $CHOICE in sudo rm /home/bitcoin/.lightning/${CLNETWORK}/hsm_secret sudo rm /home/bitcoin/.lightning/${CLNETWORK}/*.* # new - /home/admin/config.scripts/cln.hsmtool.sh new + /home/admin/config.scripts/cln.hsmtool.sh new $CHAIN ;; FILERESTORE) diff --git a/home.admin/BBcashoutWallet.sh b/home.admin/BBcashoutWallet.sh index 95db2d24e..b99a5aca0 100755 --- a/home.admin/BBcashoutWallet.sh +++ b/home.admin/BBcashoutWallet.sh @@ -1,4 +1,6 @@ #!/bin/bash +trap 'rm -f "$_temp"' EXIT +trap 'rm -f "$_error"' EXIT _temp=$(mktemp -p /dev/shm/) _error=$(mktemp -p /dev/shm/) diff --git a/home.admin/BBconnectPeer.sh b/home.admin/BBconnectPeer.sh index 008f385ef..79011d06e 100755 --- a/home.admin/BBconnectPeer.sh +++ b/home.admin/BBconnectPeer.sh @@ -1,4 +1,6 @@ #!/bin/bash +trap 'rm -f "$_temp"' EXIT +trap 'rm -f "$_error"' EXIT _temp=$(mktemp -p /dev/shm/) _error=$(mktemp -p /dev/shm/) diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh index aa1ba034e..b70866869 100755 --- a/home.admin/BBcreateInvoice.sh +++ b/home.admin/BBcreateInvoice.sh @@ -1,5 +1,7 @@ #!/bin/bash clear +trap 'rm -f "$_temp"' EXIT +trap 'rm -f "$_error"' EXIT _temp=$(mktemp -p /dev/shm/) _error=$(mktemp -p /dev/shm/) sudo chmod 7777 ${_error} 2>/dev/null diff --git a/home.admin/BBopenChannel.sh b/home.admin/BBopenChannel.sh index 59617a538..37273356f 100755 --- a/home.admin/BBopenChannel.sh +++ b/home.admin/BBopenChannel.sh @@ -1,4 +1,6 @@ #!/bin/bash +trap 'rm -f "$_temp"' EXIT +trap 'rm -f "$_error"' EXIT _temp=$(mktemp -p /dev/shm/) _error=$(mktemp -p /dev/shm/) diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh index 2785c688c..506142b81 100755 --- a/home.admin/BBpayInvoice.sh +++ b/home.admin/BBpayInvoice.sh @@ -1,5 +1,7 @@ #!/bin/bash clear +trap 'rm -f "$_temp"' EXIT +trap 'rm -f "$_error"' EXIT _temp=$(mktemp -p /dev/shm/) _error=$(mktemp -p /dev/shm/) sudo chmod 7777 ${_error} 2>/dev/null diff --git a/home.admin/config.scripts/blitz.setconf.sh b/home.admin/config.scripts/blitz.setconf.sh index 02b37450d..6591e4104 100644 --- a/home.admin/config.scripts/blitz.setconf.sh +++ b/home.admin/config.scripts/blitz.setconf.sh @@ -11,12 +11,12 @@ else echo "Opening $EDITFILE" fi +# trap to delete on any exit +trap 'rm -f $conf' EXIT + # temp conf conf=$(mktemp -p /dev/shm/) -# trap it -trap 'rm -f $conf' 0 1 2 5 15 - dialog \ --title "Editing the $EDITFILE" \ --editbox "$EDITFILE" 200 200 2> "$conf" diff --git a/home.admin/config.scripts/blitz.setpassword.sh b/home.admin/config.scripts/blitz.setpassword.sh index adfcf2e0e..5642064d7 100755 --- a/home.admin/config.scripts/blitz.setpassword.sh +++ b/home.admin/config.scripts/blitz.setpassword.sh @@ -17,6 +17,9 @@ if [ "$EUID" -ne 0 ] exit fi +# trap to delete on any exit +trap 'rm -f $_temp' EXIT + # tempfile _temp=$(mktemp -p /dev/shm/) diff --git a/home.admin/config.scripts/cln.hsmtool.sh b/home.admin/config.scripts/cln.hsmtool.sh index 2422de071..8ff414bd1 100644 --- a/home.admin/config.scripts/cln.hsmtool.sh +++ b/home.admin/config.scripts/cln.hsmtool.sh @@ -64,10 +64,11 @@ function passwordToFile() { text="Type or paste the decryption password for the $CHAIN C-lightning wallet" fi # write password into a file in memory + # trap to delete on any exit + trap 'rm -f $data' EXIT # get password data=$(mktemp -p /dev/shm/) - # trap it - trap 'rm -f $data' 0 1 2 5 15 + dialog --clear \ --backtitle "Enter password" \ --title "Enter password" \ diff --git a/home.admin/config.scripts/lnd.fwdreport.sh b/home.admin/config.scripts/lnd.fwdreport.sh index 8a45e9cf8..36be5121a 100755 --- a/home.admin/config.scripts/lnd.fwdreport.sh +++ b/home.admin/config.scripts/lnd.fwdreport.sh @@ -4,6 +4,8 @@ network=mainnet chain=bitcoin if [ "$1" = "-menu" ]; then + trap 'rm -f "$_temp"' EXIT + trap 'rm -f "$_error"' EXIT _temp=$(mktemp -p /dev/shm/) _error=$(mktemp -p /dev/shm/)