From 402f1a8a17c6c260692e1e5904a4890ffbbef4fc Mon Sep 17 00:00:00 2001 From: openoms Date: Wed, 21 Jul 2021 19:31:30 +0100 Subject: [PATCH] cln: look for files in .lightning dir with sudo --- home.admin/config.scripts/cln-plugin.backup.sh | 10 +++++----- home.admin/config.scripts/cln.install.sh | 2 +- home.admin/config.scripts/cln.setname.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/home.admin/config.scripts/cln-plugin.backup.sh b/home.admin/config.scripts/cln-plugin.backup.sh index 00f640d92..0af6a8f55 100644 --- a/home.admin/config.scripts/cln-plugin.backup.sh +++ b/home.admin/config.scripts/cln-plugin.backup.sh @@ -34,7 +34,7 @@ function install() { if [ $($lightningcli_alias plugin list 2>/dev/null | grep -c "${plugin}") -eq 0 ];then echo "# Checking dependencies" sudo -u bitcoin pip install --user -r ${plugindir}/${plugin}/requirements.txt 1>/dev/null - if [ $(echo $PATH | grep -c "/home/bitcoin/.local/bin") -eq 0 ]; then + if [ $(echo $PATH | grep -c "/home/bitcoin/.local/bin") -eq 0 ];then export PATH=$PATH:/home/bitcoin/.local/bin echo "PATH=\$PATH:/home/bitcoin/.local/bin" | sudo tee -a /etc/profile fi @@ -65,7 +65,7 @@ if [ $1 = on ];then fi # init plugin - if [ ! -f /home/bitcoin/.lightning/${CLNETWORK}/backup.lock ];then + if ! sudo ls /home/bitcoin/.lightning/${CLNETWORK}/backup.lock; then # https://github.com/lightningd/plugins/tree/master/backup#setup echo "# Initialize the backup plugin" sudo -u bitcoin ${plugindir}/backup/backup-cli init\ @@ -89,7 +89,7 @@ elif [ $1 = restore ];then install #look for a backup to restore - if [ -f /home/bitcoin/${netprefix}lightningd.sqlite3.backup ];then + if sudo ls /home/bitcoin/${netprefix}lightningd.sqlite3.backup; then sudo systemctl stop ${netprefix}lightningd @@ -97,7 +97,7 @@ elif [ $1 = restore ];then # ./backup-cli restore file:///mnt/external/location ~/.lightning/bitcoin/lightningd.sqlite3 # make sure to not overwrite old database - if [ -f /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3 ];then + if sudo ls /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3;then now=$(date +"%Y_%m_%d_%H%M%S") echo "# Backup the existing old database on the disk" sudo cp /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3 \ @@ -117,7 +117,7 @@ elif [ $1 = restore ];then elif [ $1 = backup-compact ];then - if [ -f /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3 ];then + if sudo ls /home/bitcoin/.lightning/${CLNETWORK}/lightningd.sqlite3;then # https://github.com/lightningd/plugins/tree/master/backup#performing-backup-compaction echo "# Running $lightning-cli backup-compact ..." $lightning-cli backup-compact diff --git a/home.admin/config.scripts/cln.install.sh b/home.admin/config.scripts/cln.install.sh index 22a364f5d..776bbcb09 100644 --- a/home.admin/config.scripts/cln.install.sh +++ b/home.admin/config.scripts/cln.install.sh @@ -143,7 +143,7 @@ if [ "$1" = on ]||[ "$1" = update ]||[ "$1" = experimental ]||[ "$1" = testPR ]; echo "# Create ${CLNCONF}" - if [ ! -f ${CLNCONF} ];then + if sudo ls ${CLNCONF};then echo " # lightningd configuration for ${network} ${CHAIN} diff --git a/home.admin/config.scripts/cln.setname.sh b/home.admin/config.scripts/cln.setname.sh index 5de660189..dcf138488 100644 --- a/home.admin/config.scripts/cln.setname.sh +++ b/home.admin/config.scripts/cln.setname.sh @@ -40,7 +40,7 @@ if [ ! -f ${blitzConfig} ]; then fi # check if cln config file exists -if [ ! -f ${clnConfig} ]; then +if sudo ls ${clnConfig}; then echo "FAIL - missing ${clnConfig}" exit 1 fi