script: reading klipper/moonraker dependencies from their respective install scripts

This commit is contained in:
th33xitus
2021-06-08 17:54:23 +02:00
parent 5d11cd212a
commit 02ef0578e3
2 changed files with 20 additions and 17 deletions

View File

@@ -48,19 +48,16 @@ klipper_setup_dialog(){
} }
install_klipper_packages(){ install_klipper_packages(){
### Packages for python cffi ### read PKGLIST from official install script
PKGLIST="python-virtualenv virtualenv python-dev libffi-dev build-essential" status_msg "Reading dependencies..."
### kconfig requirements install_script="${HOME}/klipper/scripts/install-octopi.sh"
PKGLIST="${PKGLIST} libncurses-dev" PKGLIST=$(grep "PKGLIST=" $install_script | sed 's/PKGLIST//g; s/[$={}\n"]//g')
### hub-ctrl ### rewrite packages into new array
PKGLIST="${PKGLIST} libusb-dev" unset PKGARR
### AVR chip installation and building for PKG in $PKGLIST; do PKGARR+=($PKG); done
PKGLIST="${PKGLIST} avrdude gcc-avr binutils-avr avr-libc" ### add dbus requirement for DietPi distro
### ARM chip installation and building PKGARR+=("dbus")
PKGLIST="${PKGLIST} stm32flash libnewlib-arm-none-eabi" echo "${cyan}${PKGARR[@]}${default}"
PKGLIST="${PKGLIST} gcc-arm-none-eabi binutils-arm-none-eabi libusb-1.0"
### dbus requirement for DietPi
PKGLIST="${PKGLIST} dbus"
### Update system package info ### Update system package info
status_msg "Running apt-get update..." status_msg "Running apt-get update..."
@@ -68,7 +65,7 @@ install_klipper_packages(){
### Install desired packages ### Install desired packages
status_msg "Installing packages..." status_msg "Installing packages..."
sudo apt-get install --yes ${PKGLIST} sudo apt-get install --yes ${PKGARR[@]}
} }
create_klipper_virtualenv(){ create_klipper_virtualenv(){

View File

@@ -146,8 +146,14 @@ moonraker_setup(){
} }
install_moonraker_packages(){ install_moonraker_packages(){
PKGLIST="python3-virtualenv python3-dev nginx libopenjp2-7 python3-libgpiod" ### read PKGLIST from official install script
PKGLIST="${PKGLIST} liblmdb0 libsodium-dev zlib1g-dev" 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 ### Update system package info
status_msg "Running apt-get update..." status_msg "Running apt-get update..."
@@ -155,7 +161,7 @@ install_moonraker_packages(){
### Install desired packages ### Install desired packages
status_msg "Installing packages..." status_msg "Installing packages..."
sudo apt-get install --yes ${PKGLIST} sudo apt-get install --yes ${PKGARR[@]}
} }
create_moonraker_virtualenv(){ create_moonraker_virtualenv(){