From b241e50ac93d71d3a1e5bd592fb02ab09d71da12 Mon Sep 17 00:00:00 2001 From: Robert Habermann Date: Sun, 24 Nov 2019 17:35:47 +0000 Subject: [PATCH] add Py2 and Py3 compat to lndlibs --- build_sdcard.sh | 9 +++++++++ home.admin/config.scripts/blitz.touchscreen.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build_sdcard.sh b/build_sdcard.sh index 353b935cd..44a017c9d 100644 --- a/build_sdcard.sh +++ b/build_sdcard.sh @@ -646,6 +646,15 @@ sudo -u admin cp -r /home/admin/raspiblitz/home.admin/assets /home/admin/ sudo -u admin cp -r /home/admin/raspiblitz/home.admin/config.scripts /home/admin/ sudo -u admin chmod +x /home/admin/config.scripts/*.sh +# make sure lndlibs are patched for compatibility for both Python2 and Python3 +if ! grep -Fxq "from __future__ import absolute_import" /home/admin/config.scripts/lndlibs/rpc_pb2_grpc.py; then + sed -i -E '1 a from __future__ import absolute_import' /home/admin/config.scripts/lndlibs/rpc_pb2_grpc.py +fi + +if ! grep -Eq "^from . import.*" /home/admin/config.scripts/lndlibs/rpc_pb2_grpc.py; then + sed -i -E 's/^(import.*_pb2)/from . \1/' /home/admin/config.scripts/lndlibs/rpc_pb2_grpc.py +fi + # add /sbin to path for all sudo bash -c "echo 'PATH=\$PATH:/sbin' >> /etc/profile" diff --git a/home.admin/config.scripts/blitz.touchscreen.sh b/home.admin/config.scripts/blitz.touchscreen.sh index 5bcafd5af..202631f25 100644 --- a/home.admin/config.scripts/blitz.touchscreen.sh +++ b/home.admin/config.scripts/blitz.touchscreen.sh @@ -36,7 +36,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then /home/admin/python3-env-lnd/bin/pip install BlitzTUI echo "" - # patch lndlibs for Python3 + # make sure lndlibs are patched for compatibility for both Python2 and Python3 if ! grep -Fxq "from __future__ import absolute_import" /home/admin/config.scripts/lndlibs/rpc_pb2_grpc.py; then sed -i -E '1 a from __future__ import absolute_import' /home/admin/config.scripts/lndlibs/rpc_pb2_grpc.py fi