Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused _jukebox_core_download_prebuilt_pyzmq #2097

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Remove unused _jukebox_core_download_prebuilt_pyzmq #2097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions installation/routines/setup_jukebox_core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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 \
Expand All @@ -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
Expand Down