jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-13 18:44:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(octoprint): update octoprint installer

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2022-10-24 10:35:30 +02:00
parent d2c009df9a
commit 2cec90b29c
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/octoprint.sh
View File

@@ -227,21 +227,30 @@ function create_octoprint_service() {
local octoprint_count=${input[0]} && unset "input[0]" local octoprint_count=${input[0]} && unset "input[0]"
local names=("${input[@]}") && unset "input[@]" local names=("${input[@]}") && unset "input[@]"
local j=0 port=5000 local j=0 port=5000
local octo_env service basedir tmp_printer config_yaml restart_cmd local printer_data octo_env service basedir printer config_yaml restart_cmd
for (( i=1; i <= octoprint_count; i++ )); do for (( i=1; i <= octoprint_count; i++ )); do
if (( octoprint_count == 1 )); then if (( octoprint_count == 1 )); then
printer_data="${HOME}/printer_data"
octo_env="${HOME}/OctoPrint" octo_env="${HOME}/OctoPrint"
service="${SYSTEMD}/octoprint.service" service="${SYSTEMD}/octoprint.service"
basedir="${HOME}/.octoprint" basedir="${HOME}/.octoprint"
tmp_printer="/tmp/printer" printer="${printer_data}/comms/klippy.serial"
config_yaml="${basedir}/config.yaml" config_yaml="${basedir}/config.yaml"
restart_cmd="sudo service octoprint restart" restart_cmd="sudo service octoprint restart"
elif (( octoprint_count > 1 )); then elif (( octoprint_count > 1 )); then
local re="^[1-9][0-9]*$"
if [[ ${names[j]} =~ ${re} ]]; then
printer_data="${HOME}/printer_${names[${j}]}_data"
else
printer_data="${HOME}/${names[${j}]}_data"
fi
octo_env="${HOME}/OctoPrint_${names[${j}]}" octo_env="${HOME}/OctoPrint_${names[${j}]}"
service="${SYSTEMD}/octoprint-${names[${j}]}.service" service="${SYSTEMD}/octoprint-${names[${j}]}.service"
basedir="${HOME}/.octoprint_${names[${j}]}" basedir="${HOME}/.octoprint_${names[${j}]}"
tmp_printer="/tmp/printer-${names[${j}]}" printer="${printer_data}/comms/klippy.serial"
config_yaml="${basedir}/config.yaml" config_yaml="${basedir}/config.yaml"
restart_cmd="sudo service octoprint-${names[${j}]} restart" restart_cmd="sudo service octoprint-${names[${j}]} restart"
fi fi
@@ -280,9 +289,9 @@ OCTOPRINT
/bin/sh -c "cat > ${basedir}/config.yaml" << CONFIGYAML /bin/sh -c "cat > ${basedir}/config.yaml" << CONFIGYAML
serial: serial:
additionalPorts: additionalPorts:
- ${tmp_printer} - ${printer}
disconnectOnErrors: false disconnectOnErrors: false
port: ${tmp_printer} port: ${printer}
server: server:
commands: commands:
serverRestartCommand: ${restart_cmd} serverRestartCommand: ${restart_cmd}

5
scripts/ui/install_menu.sh
View File

@@ -60,10 +60,7 @@ function install_menu() {
print_error "Function currently disabled! Sorry!" print_error "Function currently disabled! Sorry!"
install_ui;; install_ui;;
6) 6)
#do_action "octoprint_setup_dialog" "install_ui";; do_action "octoprint_setup_dialog" "install_ui";;
clear && print_header
print_error "Function currently disabled! Sorry!"
install_ui;;
7) 7)
#do_action "install_pgc_for_klipper" "install_ui";; #do_action "install_pgc_for_klipper" "install_ui";;
clear && print_header clear && print_header