diff options
| author | Gina Häußge <gina@foosel.net> | 2021-07-02 19:12:25 +0300 |
|---|---|---|
| committer | Gina Häußge <gina@foosel.net> | 2021-07-02 19:12:25 +0300 |
| commit | d36f1599cabca70d3aa21f6d0e481a0630f01d5d (patch) | |
| tree | eb85732b1e3d9cab43ffd3083b3812d3b1610274 | |
| parent | 0c6a3cf599a9abe7615be0f4f0ae81e4040aaf34 (diff) | |
♻️ Install OctoPrint from PyPI
| -rwxr-xr-x | src/modules/octopi/config | 3 | ||||
| -rwxr-xr-x | 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 |