fix parameter order on lnd.initwallet.py calls

This commit is contained in:
rootzoll 2021-09-12 22:55:29 +02:00
parent 14a5eb3d63
commit c22ccc2fe1
4 changed files with 8 additions and 7 deletions

View File

@ -275,7 +275,7 @@ if [ "${lightning}" == "lnd" ]; then
echo "WALLET --> SEED + SCB " >> ${logFile}
sudo sed -i "s/^message=.*/message='LND Wallet (SEED & SCB)'/g" ${infoFile}
sudo /home/admin/config.scripts/lnd.initwallet.py mainnet scb ${passwordC} "${seedWords}" "${staticchannelbackup}" ${seedPassword}
sudo /home/admin/config.scripts/lnd.initwallet.py scb mainnet ${passwordC} "${seedWords}" "${staticchannelbackup}" ${seedPassword}
if [ "${err}" != "" ]; then
sed -i "s/^state=.*/state=error/g" ${infoFile}
sed -i "s/^message=.*/message='setup: lnd wallet SCB failed'/g" ${infoFile}
@ -291,7 +291,7 @@ if [ "${lightning}" == "lnd" ]; then
echo "WALLET --> SEED" >> ${logFile}
sudo sed -i "s/^message=.*/message='LND Wallet (SEED)'/g" ${infoFile}
sudo /home/admin/config.scripts/lnd.initwallet.py mainnet seed ${passwordC} "${seedWords}" ${seedPassword}
sudo /home/admin/config.scripts/lnd.initwallet.py seed mainnet ${passwordC} "${seedWords}" ${seedPassword}
if [ "${err}" != "" ]; then
sed -i "s/^state=.*/state=error/g" ${infoFile}
sed -i "s/^message=.*/message='setup: lnd wallet SEED failed'/g" ${infoFile}
@ -307,7 +307,7 @@ if [ "${lightning}" == "lnd" ]; then
echo "WALLET --> NEW" >> ${logFile}
sudo sed -i "s/^message=.*/message='LND Wallet (NEW)'/g" ${infoFile}
source <(sudo /home/admin/config.scripts/lnd.initwallet.py mainnet new ${passwordC})
source <(sudo /home/admin/config.scripts/lnd.initwallet.py new mainnet ${passwordC})
if [ "${err}" != "" ]; then
sed -i "s/^state=.*/state=error/g" ${infoFile}
sed -i "s/^message=.*/message='setup: lnd wallet SEED failed'/g" ${infoFile}

View File

@ -786,7 +786,7 @@ if [ "${lightning}" == "lnd" ];then
if [ "${passwordFlagExists}" == "1" ]; then
echo "Found /mnt/hdd/passwordc.flag .. changing password" >> ${logFile}
oldPasswordC=$(sudo cat /mnt/hdd/passwordc.flag)
sudo /home/admin/config.scripts/lnd.initwallet.py mainnet change-password "${oldPasswordC}" "${passwordC}" >> ${logFile}
sudo /home/admin/config.scripts/lnd.initwallet.py change-password mainnet "${oldPasswordC}" "${passwordC}" >> ${logFile}
sudo shred -u /mnt/hdd/passwordc.flag
else
echo "No /mnt/hdd/passwordc.flag" >> ${logFile}

View File

@ -365,7 +365,7 @@ elif [ "${abcd}" = "c" ]; then
sleep 2
err=""
source <(sudo /home/admin/config.scripts/lnd.initwallet.py mainnet change-password $oldPassword $newPassword)
source <(sudo /home/admin/config.scripts/lnd.initwallet.py change-password mainnet $oldPassword $newPassword)
if [ "${err}" != "" ]; then
dialog --backtitle "RaspiBlitz - Setup" --msgbox "FAIL -> Was not able to change password\n\n${err}\n${errMore}" 10 52
clear

View File

@ -172,12 +172,13 @@ alias ${netprefix}lncli=\"sudo -u bitcoin /usr/local/bin/lncli\
else
passwordC="raspiblitz"
fi
source <(sudo /home/admin/config.scripts/lnd.initwallet.py mainnet new ${passwordC})
source <(sudo /home/admin/config.scripts/lnd.initwallet.py new mainnet ${passwordC})
if [ "${err}" != "" ]; then
clear
echo "# !!! LND mainnet wallet creation failed"
echo "# ${err}"
sleep 6
echo "# press ENTER to continue"
read key
else
seedFile="/mnt/hdd/lnd/data/chain/${network}/${CHAIN}/seedwords.info"
echo "seedwords='${seedwords}'" > ${seedFile}