From 0592f383bbf5e0e781b17c60b834e221a72444c9 Mon Sep 17 00:00:00 2001 From: Taylor Helsper Date: Sun, 21 Nov 2021 20:59:59 -0600 Subject: [PATCH] Remove need for python systemd package --- rootfs/standard/usr/bin/clone_drive.py | 4 +--- rootfs/standard/usr/bin/mynode_post_upgrade.sh | 5 ++--- setup/setup_device.sh | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rootfs/standard/usr/bin/clone_drive.py b/rootfs/standard/usr/bin/clone_drive.py index 3d24e9cd..a299d717 100755 --- a/rootfs/standard/usr/bin/clone_drive.py +++ b/rootfs/standard/usr/bin/clone_drive.py @@ -1,14 +1,12 @@ -#!/usr/bin/python3 +#!/usr/local/bin/python3 import time import os import subprocess import signal import logging -from systemd import journal from threading import Thread log = logging.getLogger('mynode') -log.addHandler(journal.JournaldLogHandler()) log.setLevel(logging.INFO) def print_and_log(msg): diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh index be8d6902..1fbb6153 100755 --- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh +++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh @@ -139,8 +139,7 @@ if ! skip_base_upgrades ; then pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32 --no-cache-dir - # Update Python3 to 3.7.X - PYTHON_VERSION=3.7.9 + # Update Python3 CURRENT_PYTHON3_VERSION=$(python3 --version) if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then mkdir -p /opt/download @@ -162,7 +161,7 @@ if ! skip_base_upgrades ; then # Install any pip3 software pip3 install --upgrade pip setuptools wheel - pip3 install gnureadline docker-compose pipenv bcrypt pysocks redis systemd --no-cache-dir + pip3 install gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir # Update Node diff --git a/setup/setup_device.sh b/setup/setup_device.sh index d194d901..82ea7589 100755 --- a/setup/setup_device.sh +++ b/setup/setup_device.sh @@ -225,8 +225,7 @@ pip2 install grpcio grpcio-tools googleapis-common-protos pip2 install tzupdate virtualenv pysocks redis qrcode image subprocess32 -# Update Python3 to 3.7.X -PYTHON_VERSION=3.7.9 +# Update Python3 CURRENT_PYTHON3_VERSION=$(python3 --version) if [[ "$CURRENT_PYTHON3_VERSION" != *"Python ${PYTHON_VERSION}"* ]]; then mkdir -p /opt/download @@ -249,7 +248,7 @@ fi # Install Python3 specific tools (run multiple times to make sure success) pip3 install --upgrade pip wheel setuptools pip3 install bitstring lnd-grpc pycoin aiohttp connectrum python-bitcoinlib -pip3 install gnureadline docker-compose pipenv bcrypt pysocks redis systemd --no-cache-dir +pip3 install gnureadline docker-compose pipenv bcrypt pysocks redis --no-cache-dir pip3 install flask pam python-bitcoinrpc prometheus_client psutil transmissionrpc qrcode image --no-cache-dir