h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor(klipper): rename klippy_uds to klippy.sock, and folder ipc to comms

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2022-10-19 23:16:38 +02:00
parent 3b0983b4b9
commit a6eab46f4c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/klipper.sh
View File

@@ -295,8 +295,8 @@ function configure_klipper_service() {
cfg_dir="${printer_data}/config"
cfg="${cfg_dir}/printer.cfg"
log="${printer_data}/logs/klippy.log"
printer="${printer_data}/ipc/printer"
uds="${printer_data}/ipc/klippy_uds"
printer="${printer_data}/comms/printer"
uds="${printer_data}/comms/klippy.sock"
service="${SYSTEMD}/klipper.service"
env_file="${printer_data}/systemd/klipper.env"
@@ -322,8 +322,8 @@ function configure_klipper_service() {
cfg_dir="${printer_data}/config"
cfg="${cfg_dir}/printer.cfg"
log="${printer_data}/logs/klippy.log"
printer="${printer_data}/ipc/printer"
uds="${printer_data}/ipc/klippy_uds"
printer="${printer_data}/comms/printer"
uds="${printer_data}/comms/klippy.sock"
service="${SYSTEMD}/klipper-${names[${j}]}.service"
env_file="${printer_data}/systemd/klipper.env"
@@ -436,7 +436,7 @@ function remove_klipper_logs() {
function remove_klipper_uds() {
local files
files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/klippy_uds(-[0-9a-zA-Z]+)?" | sort)
files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/klippy.sock(-[0-9a-zA-Z]+)?" | sort)
if [[ -n ${files} ]]; then
for file in ${files}; do

4
scripts/moonraker.sh
View File

@@ -249,7 +249,7 @@ function create_moonraker_conf() {
printer_data="${HOME}/printer_data"
cfg_dir="${printer_data}/config"
cfg="${cfg_dir}/moonraker.conf"
uds="/tmp/klippy_uds"
uds="/tmp/klippy.sock"
### write single instance config
write_moonraker_conf "${cfg_dir}" "${cfg}" "${port}" "${uds}" "${lan}"
@@ -267,7 +267,7 @@ function create_moonraker_conf() {
cfg_dir="${printer_data}/config"
cfg="${cfg_dir}/moonraker.conf"
uds="/tmp/klippy_uds-${names[${j}]}"
uds="/tmp/klippy.sock-${names[${j}]}"
### write multi instance config
write_moonraker_conf "${cfg_dir}" "${cfg}" "${port}" "${uds}" "${lan}"

2
scripts/utilities.sh
View File

@@ -358,7 +358,7 @@ function create_required_folders() {
[[ ! -d "${printer_data}/config" ]] && mkdir -p "${printer_data}/config"
[[ ! -d "${printer_data}/database" ]] && mkdir -p "${printer_data}/database"
[[ ! -d "${printer_data}/gcodes" ]] && mkdir -p "${printer_data}/gcodes"
[[ ! -d "${printer_data}/ipc" ]] && mkdir -p "${printer_data}/ipc"
[[ ! -d "${printer_data}/comms" ]] && mkdir -p "${printer_data}/comms"
[[ ! -d "${printer_data}/logs" ]] && mkdir -p "${printer_data}/logs"
[[ ! -d "${printer_data}/systemd" ]] && mkdir -p "${printer_data}/systemd"
}