From 1db460953a8b345635ab0454f22a7e241c31e2d2 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 23 Dec 2020 14:29:50 +0100 Subject: [PATCH] Use the supplied fbcp instead of cloning it. --- pitft.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pitft.py b/pitft.py index 8afe4b1..f276016 100644 --- a/pitft.py +++ b/pitft.py @@ -330,14 +330,7 @@ def install_fbcp(): print("Installing cmake...") if not shell.run_command("apt-get --yes --allow-downgrades --allow-remove-essential --allow-change-held-packages install cmake", True): warn_exit("Apt failed to install software!") - print("Downloading rpi-fbcp...") - shell.pushd("/tmp") - shell.run_command("curl -sLO https://github.com/adafruit/rpi-fbcp/archive/master.zip") - print("Uncompressing rpi-fbcp...") - shell.run_command("rm -rf /tmp/rpi-fbcp-master") - if not shell.run_command("unzip master.zip", True): - warn_exit("Failed to uncompress fbcp!") - shell.chdir("rpi-fbcp-master") + shell.run_command("mkdir build") shell.chdir("build") print("Building rpi-fbcp...") @@ -348,8 +341,8 @@ def install_fbcp(): warn_exit("Failed to make fbcp!") print("Installing rpi-fbcp...") shell.run_command("install fbcp /usr/local/bin/fbcp") - shell.popd() - shell.run_command("rm -rf /tmp/rpi-fbcp-master") + + shell.chdir("..") # Start fbcp in the appropriate place, depending on init system: if SYSTEMD: