Merge 6a766f7882 into d33ac6b15a

fix: parse moonraker dependencies from system-dependencies.json (#492 )
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
2025-12-26 09:13:35 +05:00 · 2024-08-03 20:52:43 +02:00 · 2024-08-03 13:30:34 +02:00 · 2023-07-07 18:56:29 +03:00
2 changed files with 3 additions and 2 deletions
--- a/scripts/flash_klipper.sh
+++ b/scripts/flash_klipper.sh
@@ -358,6 +358,7 @@ function get_usb_id() {
  unset mcu_list
  sleep 1
  mcus=$(find /dev/serial/by-id/* 2>/dev/null)
+  mcus+=" $(find /dev/serial/by-path/* 2>/dev/null)"

  for mcu in ${mcus}; do
    mcu_list+=("${mcu}")
--- a/scripts/moonraker.sh
+++ b/scripts/moonraker.sh
@@ -142,12 +142,12 @@ function moonraker_setup_dialog() {

 function install_moonraker_dependencies() {
  local packages log_name="Moonraker"
-  local install_script="${MOONRAKER_DIR}/scripts/install-moonraker.sh"
+  local package_json="${MOONRAKER_DIR}/scripts/system-dependencies.json"

  ### read PKGLIST from official install-script
  status_msg "Reading dependencies..."
  # shellcheck disable=SC2016
-  packages="$(grep "PKGLIST=" "${install_script}" | cut -d'"' -f2 | sed 's/\${PKGLIST}//g' | tr -d '\n')"
+  packages=$(cat $package_json | tr -d ' \n{}' | cut -d "]" -f1 | cut -d":" -f2 | tr -d '"[' | sed 's/,/ /g')

  echo "${cyan}${packages}${white}" | tr '[:space:]' '\n'
  read -r -a packages <<< "${packages}"
Author	SHA1	Message	Date
skarasov	e73959f061	Merge `6a766f7882` into `d33ac6b15a`	2024-08-03 20:52:43 +02:00
dw-0	d33ac6b15a	fix: parse moonraker dependencies from system-dependencies.json (#492 ) Signed-off-by: Dominik Willner <th33xitus@gmail.com>	2024-08-03 13:30:34 +02:00
skarasov	6a766f7882	Support of no id micro-controllers, see: [https://www.klipper3d.org/FAQ.html#wheres-my-serial-port ]	2023-07-07 18:56:29 +03:00