From 8d78e39e3d9cc0e378b67f8d8d3e565750b9fd2b Mon Sep 17 00:00:00 2001 From: frennkie Date: Sat, 23 May 2020 16:29:46 +0100 Subject: [PATCH] add blitzpy to build_sd --- build_sdcard.sh | 7 +++++++ home.admin/BlitzTUI/blitztui/main.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build_sdcard.sh b/build_sdcard.sh index 6bcbacad8..e52865a62 100644 --- a/build_sdcard.sh +++ b/build_sdcard.sh @@ -623,6 +623,13 @@ 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 +# install newest version of BlitzPy +blitzpy_wheel=$(ls -trR /home/admin/raspiblitz/home.admin/BlitzPy/dist | grep -E "*any.whl" | tail -n 1) +blitzpy_version=$(echo ${blitzpy_wheel} | grep -oE "([0-9]\.[0-9]\.[0-9])") +echo "" +echo "*** INSTALLING BlitzPy Version: ${blitzpy_version} ***" +sudo -H /usr/bin/python -m pip install "/home/admin/raspiblitz/home.admin/BlitzPy/dist/${blitzpy_wheel}" >/dev/null 2>&1 + # 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 diff --git a/home.admin/BlitzTUI/blitztui/main.py b/home.admin/BlitzTUI/blitztui/main.py index 67011c547..162859f27 100644 --- a/home.admin/BlitzTUI/blitztui/main.py +++ b/home.admin/BlitzTUI/blitztui/main.py @@ -17,7 +17,7 @@ import qrcode from PyQt5.QtCore import Qt, QProcess, QThread, pyqtSignal, QCoreApplication, QTimer, QEventLoop from PyQt5.QtGui import QPixmap from PyQt5.QtWidgets import QMainWindow, QApplication, QDialog, QDialogButtonBox -from blitztpy import RaspiBlitzConfig, RaspiBlitzInfo +from blitzpy import RaspiBlitzConfig, RaspiBlitzInfo from blitztui.file_logger import setup_logging from blitztui.client import ReadOnlyStub, InvoiceStub from blitztui.client import check_lnd, check_lnd_channels