From 8d5fce3b165381f295d5616b3425502341d9725b Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 12 Aug 2022 15:29:05 -0400 Subject: [PATCH 1/2] switch to hybrid --- .../dependencies.d/init-mods | 0 .../run | 36 +++++++++++++++++++ .../type | 1 + .../init-mod-nextcloud-mediadc-add-package/up | 1 + .../init-mod-nextcloud-mediadc-add-package | 0 .../init-mod-nextcloud-mediadc-add-package | 0 6 files changed, 38 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-nextcloud-mediadc-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-mediadc-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-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-nextcloud-mediadc-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run new file mode 100755 index 0000000..6a9ebd6 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run @@ -0,0 +1,36 @@ +#!/usr/bin/with-contenv bash + +if ! pip list 2>&1 | grep -q "pillow_heif" || ! pip list 2>&1 | grep -q "hexhamming" || ! pip list 2>&1 | grep -q "pywavelets"; then + echo "**** Adding pillow_heif, hexhamming, pywavelets and their deps to package install lists ****" + echo "\ + ffmpeg \ + imagemagick \ + supervisor \ + py3-numpy \ + py3-pillow \ + py3-asn1crypto \ + py3-cffi \ + py3-scipy \ + py3-pynacl \ + py3-cryptography \ + py3-pip" >> /mod-repo-packages-to-install.list + if [ $(arch) = "armv7l" ]; then + echo "**** Installing build deps for pillow_heif on arm32v7, compiling pillow_heif may take a long time in the next step ****" + echo "\ + python3-dev \ + libtool \ + git \ + gcc \ + m4 \ + perl \ + alpine-sdk \ + cmake \ + aom-dev" >> /mod-repo-packages-to-install.list + fi + echo "\ + pillow_heif \ + hexhamming \ + pywavelets" >> /mod-pip-packages-to-install.list +else + echo "**** pillow_heif, hexhamming and pywavelets already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-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-nextcloud-mediadc-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/up new file mode 100644 index 0000000..b15a150 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-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-nextcloud-mediadc-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-nextcloud-mediadc-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-mediadc-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-mediadc-add-package new file mode 100644 index 0000000..e69de29 From d6fd1a803460e56d5791d2288ff2e6795949c26a Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 4 Sep 2022 21:11:40 -0400 Subject: [PATCH 2/2] fix test and update package names --- .../s6-rc.d/init-mod-nextcloud-mediadc-add-package/run | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run index 6a9ebd6..832c312 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-mediadc-add-package/run @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash -if ! pip list 2>&1 | grep -q "pillow_heif" || ! pip list 2>&1 | grep -q "hexhamming" || ! pip list 2>&1 | grep -q "pywavelets"; then - echo "**** Adding pillow_heif, hexhamming, pywavelets and their deps to package install lists ****" +if ! pip list 2> /dev/null | grep -q "pillow-heif" || ! pip list 2> /dev/null | grep -q "hexhamming" || ! pip list 2> /dev/null | grep -q "PyWavelets"; then + echo "**** Adding pillow-heif, hexhamming, pywavelets and their deps to package install lists ****" echo "\ ffmpeg \ imagemagick \ @@ -15,7 +15,7 @@ if ! pip list 2>&1 | grep -q "pillow_heif" || ! pip list 2>&1 | grep -q "hexhamm py3-cryptography \ py3-pip" >> /mod-repo-packages-to-install.list if [ $(arch) = "armv7l" ]; then - echo "**** Installing build deps for pillow_heif on arm32v7, compiling pillow_heif may take a long time in the next step ****" + echo "**** Installing build deps for pillow-heif on arm32v7, compiling pillow_heif may take a long time in the next step ****" echo "\ python3-dev \ libtool \ @@ -28,9 +28,9 @@ if ! pip list 2>&1 | grep -q "pillow_heif" || ! pip list 2>&1 | grep -q "hexhamm aom-dev" >> /mod-repo-packages-to-install.list fi echo "\ - pillow_heif \ + pillow-heif \ hexhamming \ pywavelets" >> /mod-pip-packages-to-install.list else - echo "**** pillow_heif, hexhamming and pywavelets already installed, skipping ****" + echo "**** pillow-heif, hexhamming and pywavelets already installed, skipping ****" fi