Skip to content
Snippets Groups Projects

Master

Merged Master
master into dev
Merged Adri requested to merge master into dev
Compare
and
1 file
+ 6
− 6
Compare changes
  • Side-by-side
  • Inline
install.sh
+ 6
− 6
@@ -98,12 +98,12 @@ patch()
mv "${MOONRAKER_PATH}/moonraker/app.py" "${MOONRAKER_PATH}/moonraker/app.py.old"
# Link the patch to the config
ln -sf "${SRCDIR}/Scripts/CreateThumbnail/Patch/app.py" "${MOONRAKER_PATH}/moonraker/app.py"
ln -sf "${SRCDIR}/Scripts/CreateThumbnail/Patch/bed_texture.jpg" "${MOONRAKER_PATH}/moonraker/bed_texture.jpg"
ln -sf "${SRCDIR}/Scripts/CreateThumbnail/Patch/gcode2png.py" "${MOONRAKER_PATH}/moonraker/gcode2png.py"
ln -sf "${SRCDIR}/Scripts/CreateThumbnail/Patch/gcode2png.pyc" "${MOONRAKER_PATH}/moonraker/gcode2png.pyc"
ln -sf "${SRCDIR}/Scripts/CreateThumbnail/Patch/gcodeParser.py" "${MOONRAKER_PATH}/moonraker/gcodeParser.py"
ln -sf "${SRCDIR}/Scripts/CreateThumbnail/Patch/gcodeParser.pyc" "${MOONRAKER_PATH}/moonraker/gcodeParser.pyc"
ln -sf "${SRCDIR}/klipper/Extras/CreateThumbnail/Patch/app.py" "${MOONRAKER_PATH}/moonraker/app.py"
ln -sf "${SRCDIR}/klipper/Extras/CreateThumbnail/Patch/bed_texture.jpg" "${MOONRAKER_PATH}/moonraker/bed_texture.jpg"
ln -sf "${SRCDIR}/klipper/Extras/CreateThumbnail/Patch/gcode2png.py" "${MOONRAKER_PATH}/moonraker/gcode2png.py"
ln -sf "${SRCDIR}/klipper/Extras/CreateThumbnail/Patch/gcode2png.pyc" "${MOONRAKER_PATH}/moonraker/gcode2png.pyc"
ln -sf "${SRCDIR}/klipper/Extras/CreateThumbnail/Patch/gcodeParser.py" "${MOONRAKER_PATH}/moonraker/gcodeParser.py"
ln -sf "${SRCDIR}/klipper/Extras/CreateThumbnail/Patch/gcodeParser.pyc" "${MOONRAKER_PATH}/moonraker/gcodeParser.pyc"
# If venv exists and user prompts a rebuild, then do so
if [ -d ${PYTHONDIR} ] && [ $REBUILD_ENV = "y" ]; then