diff --git a/docs/Installation.md b/docs/Installation.md index 27001014..cd07b28d 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -68,9 +68,9 @@ If you wish to use the update manager feature of moonraker for KlipperScreen, ad type: git_repo path: ~/KlipperScreen origin: https://github.com/KlipperScreen/KlipperScreen.git -env: ~/.KlipperScreen-env/bin/python +virtualenv: ~/.KlipperScreen-env/bin/python requirements: scripts/KlipperScreen-requirements.txt -install_script: scripts/KlipperScreen-install.sh +system_dependencies: scripts/system-dependencies.json managed_services: KlipperScreen ``` !!! note diff --git a/scripts/KlipperScreen-install.sh b/scripts/KlipperScreen-install.sh index 4c48a6bd..e0fd05fc 100755 --- a/scripts/KlipperScreen-install.sh +++ b/scripts/KlipperScreen-install.sh @@ -8,13 +8,9 @@ XSERVER="xinit xinput x11-xserver-utils xserver-xorg-input-evdev xserver-xorg-in FBDEV="xserver-xorg-video-fbdev" PYTHON="python3-virtualenv virtualenv python3-distutils" PYGOBJECT="libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0" -MISC="librsvg2-common libopenjp2-7 libatlas-base-dev wireless-tools libdbus-glib-1-dev autoconf" +MISC="librsvg2-common libopenjp2-7 wireless-tools libdbus-glib-1-dev autoconf" OPTIONAL="xserver-xorg-legacy fonts-nanum fonts-ipafont libmpv-dev" -# moonraker will check this list when updating -# if new packages are required for existing installs add them below too. -PKGLIST="libdbus-glib-1-dev autoconf fonts-ipafont libmpv-dev" - Red='\033[0;31m' Green='\033[0;32m' Cyan='\033[0;36m' diff --git a/scripts/system-dependencies.json b/scripts/system-dependencies.json new file mode 100644 index 00000000..0b299abb --- /dev/null +++ b/scripts/system-dependencies.json @@ -0,0 +1,47 @@ +{ + "debian": [ + "python3-virtualenv", + "virtualenv", + "python3-distutils", + "libgirepository1.0-dev", + "gcc", + "libcairo2-dev", + "pkg-config", + "python3-dev", + "gir1.2-gtk-3.0", + "xinit", + "xinput", + "x11-xserver-utils", + "xserver-xorg-input-evdev", + "xserver-xorg-input-libinput", + "xserver-xorg-video-fbdev", + "xserver-xorg-legacy", + "fonts-nanum", + "fonts-ipafont", + "libmpv-dev", + "librsvg2-common", + "libopenjp2-7", + "wireless-tools", + "libdbus-glib-1-dev", + "autoconf" + ], + "arch": [ + "python-virtualenv", + "cairo", + "pkgconf", + "gobject-introspection", + "gtk3", + "xorg-xinit", + "xorg-server", + "xf86-input-evdev", + "xf86-input-libinput", + "xf86-video-fbdev", + "ttf-nanum", + "otf-ipafont", + "mpv", + "librsvg", + "openjpeg2", + "dbus-glib", + "autoconf" + ] +} \ No newline at end of file