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