From 0660586f7ec96aea75006cc8df8b86e1d3d11542 Mon Sep 17 00:00:00 2001 From: Christian Tietze Date: Wed, 8 Nov 2023 17:01:23 +0100 Subject: [PATCH] Remove unused _jukebox_core_download_prebuilt_pyzmq (#2097) See report #2094 --- installation/routines/setup_jukebox_core.sh | 22 ++------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/installation/routines/setup_jukebox_core.sh b/installation/routines/setup_jukebox_core.sh index 6f773f129..45eb1610c 100644 --- a/installation/routines/setup_jukebox_core.sh +++ b/installation/routines/setup_jukebox_core.sh @@ -59,7 +59,7 @@ _jukebox_core_build_libzmq_with_drafts() { make && make install } -_jukebox_core_download_prebuild_libzmq_with_drafts() { +_jukebox_core_download_prebuilt_libzmq_with_drafts() { local ZMQ_TAR_FILENAME="libzmq.tar.gz" _download_file_from_google_drive "${LIBZMQ_GD_DOWNLOAD_ID}" "${ZMQ_TAR_FILENAME}" @@ -95,7 +95,7 @@ _jukebox_core_build_and_install_pyzmq() { if [ "$BUILD_LIBZMQ_WITH_DRAFTS_ON_DEVICE" = true ] ; then _jukebox_core_build_libzmq_with_drafts else - _jukebox_core_download_prebuild_libzmq_with_drafts + _jukebox_core_download_prebuilt_libzmq_with_drafts fi sudo ZMQ_PREFIX="${ZMQ_PREFIX}" ZMQ_DRAFT_API=1 \ @@ -105,24 +105,6 @@ _jukebox_core_build_and_install_pyzmq() { fi } -_jukebox_core_download_prebuilt_pyzmq() { - echo " Download prebuilt pyzmq with WebSockets Support" - local PYZMQ_TAR_FILENAME="pyzmq-build-armv6.tar.gz" - - cd "${HOME_PATH}" || exit_on_error - - # ARMv7 as default - PYZMQ_GD_DOWNLOAD_ID=${GD_ID_COMPILED_PYZMQ_ARMV7} - if [[ $(uname -m) == "armv6l" ]]; then - # ARMv6 as fallback - PYZMQ_GD_DOWNLOAD_ID=${GD_ID_COMPILED_PYZMQ_ARMV6} - fi - - _download_file_from_google_drive "${PYZMQ_GD_DOWNLOAD_ID}" "${PYZMQ_TAR_FILENAME}" - tar -xvf "${PYZMQ_TAR_FILENAME}" -C / - rm -f "${PYZMQ_TAR_FILENAME}" -} - _jukebox_core_install_python_requirements() { echo " Install requirements" cd "${INSTALLATION_PATH}" || exit_on_error