From d36f1599cabca70d3aa21f6d0e481a0630f01d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@foosel.net>
Date: Fri, 2 Jul 2021 18:12:25 +0200
Subject: =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Install=20OctoPrint=20from=20PyPI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/octopi/config              | 3 +--
 src/modules/octopi/start_chroot_script | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/octopi/config b/src/modules/octopi/config
index e9f3d06..c9474d1 100755
--- a/src/modules/octopi/config
+++ b/src/modules/octopi/config
@@ -2,8 +2,7 @@
 # All our config settings must start with OCTOPI_
 
 # OctoPrint archive
-[ -n "$OCTOPI_OCTOPRINT_ARCHIVE" ] || OCTOPI_OCTOPRINT_ARCHIVE=$(wget -q -O - https://api.github.com/repos/foosel/OctoPrint/releases/latest | grep "zipball_url" | cut -d : -f 2,3 | tr -d \" | tr -d ,)
-[ -n "$OCTOPI_OCTOPRINT_REPO_SHIP" ] || OCTOPI_OCTOPRINT_REPO_SHIP=https://github.com/foosel/OctoPrint.git
+[ -n "$OCTOPI_OCTOPRINT_PACKAGE" ] || OCTOPI_OCTOPRINT_PACKAGE="OctoPrint"
 [ -n "$OCTOPI_INCLUDE_OCTOPRINT" ] || OCTOPI_INCLUDE_OCTOPRINT=yes
 
 # CuraEngine archive & version
diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script
index 1b905a8..bed1ed9 100755
--- a/src/modules/octopi/start_chroot_script
+++ b/src/modules/octopi/start_chroot_script
@@ -53,7 +53,7 @@ pushd /home/"${BASE_USER}"
   if [ "$OCTOPI_INCLUDE_OCTOPRINT" == "yes" ]
   then
     echo "--- Installing OctoPrint"
-    PIP_DEFAULT_TIMEOUT=60 sudo -u "${BASE_USER}" /home/"${BASE_USER}"/oprint/bin/pip install $OCTOPI_OCTOPRINT_ARCHIVE
+    PIP_DEFAULT_TIMEOUT=60 sudo -u "${BASE_USER}" /home/"${BASE_USER}"/oprint/bin/pip install $OCTOPI_OCTOPRINT_PACKAGE
   fi
 
   #mjpg-streamer
-- 
cgit v1.2.3