From f59ea5f7690c9a01ef6f7f6508084a66c40b1dae Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Apr 2024 19:44:25 +0200 Subject: Merging upstream version 4.2.4. Signed-off-by: Daniel Baumann --- tools/macos-setup-brew.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tools/macos-setup-brew.sh') diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh index 17c92ced..910f7e86 100755 --- a/tools/macos-setup-brew.sh +++ b/tools/macos-setup-brew.sh @@ -108,7 +108,6 @@ ADDITIONAL_LIST=( libsmi libssh libxml2 - lua@5.1 lz4 minizip opus @@ -140,8 +139,13 @@ fi install_formulae "${ACTUAL_LIST[@]}" +if [ $INSTALL_OPTIONAL -ne 0 ] ; then + brew install lua@5.1 || printf "Lua 5.1 installation failed.\\n" +fi + if [ $INSTALL_DMG_DEPS -ne 0 ] ; then - pip3 install dmgbuild + printf "Sorry, you'll have to install dmgbuild yourself for the time being.\\n" + # pip3 install dmgbuild fi if [ $INSTALL_SPARKLE_DEPS -ne 0 ] ; then @@ -149,7 +153,8 @@ if [ $INSTALL_SPARKLE_DEPS -ne 0 ] ; then fi if [ $INSTALL_TEST_DEPS -ne 0 ] ; then - pip3 install pytest pytest-xdist + printf "Sorry, you'll have to install pytest and pytest-xdist yourself for the time being.\\n" + # pip3 install pytest pytest-xdist fi # Uncomment to add PNG compression utilities used by compress-pngs: -- cgit v1.2.3