From a6eab46f4c856311d0b6b64bd752f08127a50663 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Wed, 19 Oct 2022 23:16:38 +0200
Subject: [PATCH] refactor(klipper): rename klippy_uds to klippy.sock, and
 folder ipc to comms

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
---
 scripts/klipper.sh   | 10 +++++-----
 scripts/moonraker.sh |  4 ++--
 scripts/utilities.sh |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/klipper.sh b/scripts/klipper.sh
index c7f867f..5edb442 100644
--- a/scripts/klipper.sh
+++ b/scripts/klipper.sh
@@ -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
diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh
index 001ba53..7e16141 100644
--- a/scripts/moonraker.sh
+++ b/scripts/moonraker.sh
@@ -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}"
diff --git a/scripts/utilities.sh b/scripts/utilities.sh
index 789c82d..b793425 100644
--- a/scripts/utilities.sh
+++ b/scripts/utilities.sh
@@ -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"
 }