logan/touchprint
1
0
Fork 0
Code Issues 2 Pull requests Releases 2 Wiki Activity

Compare commits

base: logan:642926ae73e6c178a7b9cb00ed88122548540f14
Branches Tags
logan:master
logan:v1.2
logan:python2
logan:v0.2
logan:v0.1
...
compare: logan:06b2b84d43e1fd27fa778234008fb035eba6718f
Branches Tags
logan:v1.2
logan:master
logan:python2
logan:v0.2
logan:v0.1

2 commits
642926ae73 ... 06b2b84d43

Author SHA1 Message Date
Logan Gartner
06b2b84d43
Revert "Switched ExcludeRegion to the Python 3 fork" 
This reverts commit 6ada361238.
 2020-10-10 20:58:10 -06:00
Logan Gartner
5d74642e44
Revert "Switched to Python 3" 
This reverts commit f79bf92d7e.
 2020-10-10 20:58:01 -06:00
3 changed files with 8 additions and 7 deletions
Show stats Expand all files Collapse all files

8
stage2/04-octoprint/00-packages
View file

@ -1,7 +1,7 @@
python3-pip python-pip
python3-dev python-dev
python3-setuptools python-setuptools
python3-venv python-virtualenv
git git
libyaml-dev libyaml-dev
nginx nginx

5
stage2/04-octoprint/01-run.sh
View file

@ -23,8 +23,9 @@ systemctl disable nginx
# If OctoPrint already exists, skip this (for debugging) # If OctoPrint already exists, skip this (for debugging)
if [[ ! -f /srv/octoprint/bin/octoprint ]]; then if [[ ! -f /srv/octoprint/bin/octoprint ]]; then
python3 -m venv /srv/octoprint || exit 1 cd /srv/ || exit 1
source /srv/octoprint/bin/activate || exit 1 virtualenv octoprint || exit 1
source octoprint/bin/activate || exit 1
pip install pip --upgrade pip install pip --upgrade
pip install octoprint || exit 1 pip install octoprint || exit 1
# Fix permissions # Fix permissions

2
stage2/06-utils/files/first-time.sh
View file

@ -41,7 +41,7 @@ recommended_menu () {
echo $(( $i * 100 / ${#RECOMMEND_MENU[@]} )) | dialog --title "Plugin Manager" --gauge "Installing ${RECOMMEND_MENU[$i]}" 10 50 echo $(( $i * 100 / ${#RECOMMEND_MENU[@]} )) | dialog --title "Plugin Manager" --gauge "Installing ${RECOMMEND_MENU[$i]}" 10 50
case ${RECOMMEND_MENU[$i]} in case ${RECOMMEND_MENU[$i]} in
"OctoPrint-Dashboard") install_package "https://github.com/StefanCohen/OctoPrint-Dashboard/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]}; install_package "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip" || error_install ${RECOMMEND_MENU[$i]};; "OctoPrint-Dashboard") install_package "https://github.com/StefanCohen/OctoPrint-Dashboard/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]}; install_package "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
"ExcludeRegion") install_package "https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin/archive/feature/python3_compat.zip" || error_install ${RECOMMEND_MENU[$i]};; "ExcludeRegion") install_package "https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
"NavbarTemp") install_package "https://github.com/imrahil/OctoPrint-NavbarTemp/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};; "NavbarTemp") install_package "https://github.com/imrahil/OctoPrint-NavbarTemp/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
"PrintTimeGenius") install_package "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};; "PrintTimeGenius") install_package "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
"HeaterTimeout") install_package "https://github.com/google/OctoPrint-HeaterTimeout/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};; "HeaterTimeout") install_package "https://github.com/google/OctoPrint-HeaterTimeout/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;