diff options
| author | Guy Sheffer <guysoft@gmail.com> | 2021-07-03 15:05:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 15:05:51 +0300 |
| commit | c5d08fc58e09935a4e5f01e4e05aa467f2e1b1c6 (patch) | |
| tree | 4277b46dc0120fac02d27aa87c9b56ecfa4c01cc | |
| parent | d2cc74aa233f87b20dfb1c949d55d92fdd55755c (diff) | |
| parent | d36f1599cabca70d3aa21f6d0e481a0630f01d5d (diff) | |
Merge pull request #744 from foosel/octoprint-pip
♻️ 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 4387161..5064055 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 e57442a..ac6ca0d 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 |