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

Compare commits

base: logan:0b4318d557b2d0c4539fc6e680ac7b23083fbc39
Branches Tags
logan:master
logan:v1.2
logan:python2
logan:v0.2
logan:v0.1
..
compare: logan:87ebff5bcaa42c7d34e4f0cddb340494380f1d1c
Branches Tags
logan:v1.2
logan:master
logan:python2
logan:v0.2
logan:v0.1

4 commits
0b4318d557 ... 87ebff5bca

Author SHA1 Message Date
Logan Gartner
87ebff5bca
Updated TODO, removed redundant python install 2020-10-10 20:47:55 -06:00
Logan Gartner
6ada361238
Switched ExcludeRegion to the Python 3 fork 2020-10-10 17:58:22 -06:00
Logan Gartner
f79bf92d7e
Switched to Python 3 
We now use venv instead of virtualenv as well
Also the virtualenv is now created with an absolute path
 2020-10-10 17:51:21 -06:00
Logan Gartner
d29f179072
Updated TODO 2020-09-25 14:41:36 -06:00
5 changed files with 8 additions and 11 deletions
Show stats Expand all files Collapse all files

2
TODO.md
View file

@ -3,6 +3,7 @@
## First time/TP-Config ## First time/TP-Config
- Add network configuration (replace nmtui) - Add network configuration (replace nmtui)
- Add hostname configuration (replace nmtui) - Add hostname configuration (replace nmtui)
- Import/export settings
## Misc ## Misc
- Cleanup - Cleanup
@ -11,5 +12,4 @@
## Things to consider ## Things to consider
- Wayland using labwc/waybox - Wayland using labwc/waybox
- Python 3
- Detect if frontend did not load correctly (probably not easy) - Detect if frontend did not load correctly (probably not easy)

2
stage2/01-sys-tweaks/00-packages
View file

@ -14,11 +14,9 @@ parted
unzip unzip
build-essential build-essential
manpages-dev manpages-dev
python
bash-completion bash-completion
gdb gdb
pkg-config pkg-config
python-rpi.gpio
v4l-utils v4l-utils
avahi-daemon avahi-daemon
hardlink hardlink

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

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

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

@ -23,9 +23,8 @@ 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
cd /srv/ || exit 1 python3 -m venv /srv/octoprint || exit 1
virtualenv octoprint || exit 1 source /srv/octoprint/bin/activate || 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/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]};;
"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]};;