From cbd980c380c636b86735d9873bfc3baefcf9f4c4 Mon Sep 17 00:00:00 2001
From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:10:06 +0100
Subject: [PATCH] fix folder handling ZMQ_TMP_DIR

---
 installation/routines/setup_jukebox_core.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/installation/routines/setup_jukebox_core.sh b/installation/routines/setup_jukebox_core.sh
index 0568feb64..89f2e11d1 100644
--- a/installation/routines/setup_jukebox_core.sh
+++ b/installation/routines/setup_jukebox_core.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Constants
-ZMQ_TMP_DIR="libzmq"
+ZMQ_TMP_DIR="${HOME_PATH}/libzmq"
 ZMQ_PREFIX="/usr/local"
 ZMQ_VERSION="4.3.5"
 
@@ -52,7 +52,7 @@ _jukebox_core_build_libzmq_with_drafts() {
 
   LIBSODIUM_VERSION="1.0.18"
   echo "    Building libsodium v${LIBSODIUM_VERSION}" | tee /dev/fd/3
-  { cd "${HOME_PATH}" && mkdir "${ZMQ_TMP_DIR}" && cd "${ZMQ_TMP_DIR}"; } || exit_on_error
+  { mkdir "${ZMQ_TMP_DIR}" && cd "${ZMQ_TMP_DIR}"; } || exit_on_error
   wget --quiet https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz
   tar -zxvf libsodium-${LIBSODIUM_VERSION}.tar.gz
   cd libsodium-${LIBSODIUM_VERSION} || exit_on_error
@@ -60,7 +60,7 @@ _jukebox_core_build_libzmq_with_drafts() {
   make && make install
 
   echo "    Building libzmq v${ZMQ_VERSION}" | tee /dev/fd/3
-  cd "${HOME}/${ZMQ_TMP_DIR}" || exit_on_error
+  cd "${ZMQ_TMP_DIR}" || exit_on_error
   wget https://github.com/zeromq/libzmq/releases/download/v${ZMQ_VERSION}/zeromq-${ZMQ_VERSION}.tar.gz -O libzmq.tar.gz
   tar -xzf libzmq.tar.gz
   zeromq-${ZMQ_VERSION}/configure --prefix=${ZMQ_PREFIX} --enable-drafts
@@ -71,6 +71,8 @@ _jukebox_core_download_prebuilt_libzmq_with_drafts() {
   local ZMQ_TAR_FILENAME="libzmq.tar.gz"
   ARCH=$(get_architecture)
 
+  { mkdir "${ZMQ_TMP_DIR}" && cd "${ZMQ_TMP_DIR}"; } || exit_on_error
+
   wget https://github.com/pabera/libzmq/releases/download/v${ZMQ_VERSION}/libzmq5-${ARCH}-${ZMQ_VERSION}.tar.gz -O ${ZMQ_TAR_FILENAME}
   tar -xzf ${ZMQ_TAR_FILENAME}
   rm -f ${ZMQ_TAR_FILENAME}
@@ -91,8 +93,6 @@ _jukebox_core_build_and_install_pyzmq() {
     # Download pre-compiled libzmq from Google Drive because RPi has trouble compiling it
     echo "    Download pre-compiled libzmq from Google Drive because RPi has trouble compiling it"
 
-    { cd "${HOME_PATH}" && mkdir "${ZMQ_TMP_DIR}" && cd "${ZMQ_TMP_DIR}"; } || exit_on_error
-
     if [[ $(uname -m) == "armv6l" ]]; then
       _show_slow_hardware_message
     fi