From 02ef0578e3536e84cc08fff89f08bca433c1058c Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Tue, 8 Jun 2021 17:54:23 +0200
Subject: [PATCH] script: reading klipper/moonraker dependencies from their
 respective install scripts

---
 scripts/install_klipper.sh   | 25 +++++++++++--------------
 scripts/install_moonraker.sh | 12 +++++++++---
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/scripts/install_klipper.sh b/scripts/install_klipper.sh
index d017996..5f82b4a 100755
--- a/scripts/install_klipper.sh
+++ b/scripts/install_klipper.sh
@@ -48,19 +48,16 @@ klipper_setup_dialog(){
 }
 
 install_klipper_packages(){
-  ### Packages for python cffi
-  PKGLIST="python-virtualenv virtualenv python-dev libffi-dev build-essential"
-  ### kconfig requirements
-  PKGLIST="${PKGLIST} libncurses-dev"
-  ### hub-ctrl
-  PKGLIST="${PKGLIST} libusb-dev"
-  ### AVR chip installation and building
-  PKGLIST="${PKGLIST} avrdude gcc-avr binutils-avr avr-libc"
-  ### ARM chip installation and building
-  PKGLIST="${PKGLIST} stm32flash libnewlib-arm-none-eabi"
-  PKGLIST="${PKGLIST} gcc-arm-none-eabi binutils-arm-none-eabi libusb-1.0"
-  ### dbus requirement for DietPi
-  PKGLIST="${PKGLIST} dbus"
+  ### read PKGLIST from official install script
+  status_msg "Reading dependencies..."
+  install_script="${HOME}/klipper/scripts/install-octopi.sh"
+  PKGLIST=$(grep "PKGLIST=" $install_script | sed 's/PKGLIST//g; s/[$={}\n"]//g')
+  ### rewrite packages into new array
+  unset PKGARR
+  for PKG in $PKGLIST; do PKGARR+=($PKG); done
+  ### add dbus requirement for DietPi distro
+  PKGARR+=("dbus")
+  echo "${cyan}${PKGARR[@]}${default}"
 
   ### Update system package info
   status_msg "Running apt-get update..."
@@ -68,7 +65,7 @@ install_klipper_packages(){
 
   ### Install desired packages
   status_msg "Installing packages..."
-  sudo apt-get install --yes ${PKGLIST}
+  sudo apt-get install --yes ${PKGARR[@]}
 }
 
 create_klipper_virtualenv(){
diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh
index 8b4718d..bf79dbc 100755
--- a/scripts/install_moonraker.sh
+++ b/scripts/install_moonraker.sh
@@ -146,8 +146,14 @@ moonraker_setup(){
 }
 
 install_moonraker_packages(){
-  PKGLIST="python3-virtualenv python3-dev nginx libopenjp2-7 python3-libgpiod"
-  PKGLIST="${PKGLIST} liblmdb0 libsodium-dev zlib1g-dev"
+  ### read PKGLIST from official install script
+  status_msg "Reading dependencies..."
+  install_script="${HOME}/moonraker/scripts/install-moonraker.sh"
+  PKGLIST=$(grep "PKGLIST=" $install_script | sed 's/PKGLIST//g; s/[$={}\n"]//g')
+  ### rewrite packages into new array
+  unset PKGARR
+  for PKG in $PKGLIST; do PKGARR+=($PKG); done
+  echo "${cyan}${PKGARR[@]}${default}"
 
   ### Update system package info
   status_msg "Running apt-get update..."
@@ -155,7 +161,7 @@ install_moonraker_packages(){
 
   ### Install desired packages
   status_msg "Installing packages..."
-  sudo apt-get install --yes ${PKGLIST}
+  sudo apt-get install --yes ${PKGARR[@]}
 }
 
 create_moonraker_virtualenv(){