Skip to content

Commit

Permalink
Remove unused _jukebox_core_download_prebuilt_pyzmq (MiczFlor#2097)
Browse files Browse the repository at this point in the history
See report MiczFlor#2094
  • Loading branch information
DivineDominion committed Nov 8, 2023
1 parent 373fd38 commit 0660586
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions installation/routines/setup_jukebox_core.sh
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

0 comments on commit 0660586

Please sign in to comment.