From 3b6a15bed1f426064618c3a477d106798822adab Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 12 Aug 2022 14:40:09 -0400 Subject: [PATCH 1/2] switch to hybrid --- README.md | 2 +- .../dependencies.d/init-mods | 0 .../s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run | 8 ++++++++ .../init-mod-lazylibrarian-ffmpeg-add-package/type | 1 + .../s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up | 1 + .../init-mod-lazylibrarian-ffmpeg-add-package | 0 .../contents.d/init-mod-lazylibrarian-ffmpeg-add-package | 0 7 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-lazylibrarian-ffmpeg-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-lazylibrarian-ffmpeg-add-package diff --git a/README.md b/README.md index e99ddd3..eb9a22c 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,6 @@ This mod adds ffmpeg to lazylibrarian, to be installed/updated during container In lazylibrarian docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:lazylibrarian-ffmpeg` -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:lazylibrarian-ffmpeg|linuxserver/calibre-web:calibre` +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:lazylibrarian-ffmpeg|linuxserver/mods:universal-calibre` To enable it you can set the ffmpeg path under Settings > Processing > External Programs to `ffmpeg` in the LazyLibrarian Web UI. diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run new file mode 100755 index 0000000..a0eee32 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +if ! dpkg -s ffmpeg >/dev/null 2>&1; then + echo "**** Adding ffmpeg to package install list ****" + echo "ffmpeg" >> /mod-repo-packages-to-install.list +else + echo "**** ffmpeg already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up new file mode 100644 index 0000000..c9e60ff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up @@ -0,0 +1 @@ +/etc/s6overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-lazylibrarian-ffmpeg-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-lazylibrarian-ffmpeg-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-lazylibrarian-ffmpeg-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-lazylibrarian-ffmpeg-add-package new file mode 100644 index 0000000..e69de29 From 7063415ec02f7c222330e62f2c49ce902fda684b Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 5 Sep 2022 21:38:22 -0400 Subject: [PATCH 2/2] fix typo --- .../s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up index c9e60ff..2c24b12 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/up @@ -1 +1 @@ -/etc/s6overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run \ No newline at end of file +/etc/s6-overlay/s6-rc.d/init-mod-lazylibrarian-ffmpeg-add-package/run \ No newline at end of file