From 059dd8dc360e991589077a7acad35a758188b982 Mon Sep 17 00:00:00 2001 From: Guillaume A Date: Sat, 1 Jul 2023 21:39:52 +0800 Subject: [PATCH] improvment for umbrel installs in custom directories --- igniter.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/igniter.sh b/igniter.sh index 77ea887..ff475bf 100755 --- a/igniter.sh +++ b/igniter.sh @@ -17,17 +17,20 @@ IFS=, eval 'HOPS="${pub_keys[*]}"' # If an umbrel, use docker, else call lncli directly. Also setup dependencies accordingly. LNCLI="lncli" -if [ -d "$HOME/umbrel" ] ; then - # Umbrel < 0.5.x - if docker ps -q -f name=^lnd$ | grep -q . ; then - LNCLI="docker exec -i lnd lncli" - # Umbrel >= 0.5.x - else - LNCLI="$HOME/umbrel/scripts/app compose lightning exec lnd lncli" +dependencies="cat jq lncli" + +# Check if docker is installed +if command -v docker &> /dev/null; then + CONTAINERS=$(docker ps --format "{{.Names}}") + + # Check if the container is running + if grep -qw "lightning_lnd_1" <<< "$CONTAINERS"; then + # Umbrel + LNCLI="docker exec -i lightning_lnd_1 lncli" + dependencies="cat jq" fi - dependencies="cat jq" else - dependencies="cat jq lncli" + echo "Docker is not installed" fi # Arg option: 'build'