From cfa01b78fc6b595903c108de6f359fab17888144 Mon Sep 17 00:00:00 2001
From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:35:51 +0100
Subject: [PATCH] fix and add checks

---
 installation/includes/00_constants.sh       |  1 +
 installation/routines/setup_jukebox_core.sh | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/installation/includes/00_constants.sh b/installation/includes/00_constants.sh
index e19dd1327..f7ba7b40a 100644
--- a/installation/includes/00_constants.sh
+++ b/installation/includes/00_constants.sh
@@ -2,6 +2,7 @@ RPI_BOOT_CONFIG_FILE="/boot/config.txt"
 SHARED_PATH="${INSTALLATION_PATH}/shared"
 SETTINGS_PATH="${SHARED_PATH}/settings"
 SYSTEMD_USR_PATH="/usr/lib/systemd/user"
+VIRTUAL_ENV="${INSTALLATION_PATH}/.venv"
 
 # The default upstream user, release branch, and develop branch
 # These are used to prepare the repo for developers
diff --git a/installation/routines/setup_jukebox_core.sh b/installation/routines/setup_jukebox_core.sh
index 3679f666b..44e50f63f 100644
--- a/installation/routines/setup_jukebox_core.sh
+++ b/installation/routines/setup_jukebox_core.sh
@@ -10,6 +10,7 @@ ZMQ_TMP_DIR="libzmq"
 ZMQ_PREFIX="/usr/local"
 
 JUKEBOX_PULSE_CONFIG="${HOME_PATH}"/.config/pulse/default.pa
+JUKEBOX_SERVICE_NAME="${SYSTEMD_USR_PATH}/jukebox-daemon.service"
 
 _show_slow_hardware_message() {
 echo "  --------------------------------------------------------------------
@@ -40,7 +41,6 @@ _jukebox_core_install_python_requirements() {
 
   cd "${INSTALLATION_PATH}"  || exit_on_error
 
-  VIRTUAL_ENV="${INSTALLATION_PATH}/.venv"
   python3 -m venv $VIRTUAL_ENV
   source "$VIRTUAL_ENV/bin/activate"
 
@@ -127,10 +127,9 @@ _jukebox_core_install_settings() {
 _jukebox_core_register_as_service() {
   echo "  Register Jukebox Core user service"
 
-  local jukebox_service="${SYSTEMD_USR_PATH}/jukebox-daemon.service"
-  sudo cp -f "${INSTALLATION_PATH}/resources/default-services/jukebox-daemon.service" "${jukebox_service}"
-  sudo sed -i "s|%%INSTALLATION_PATH%%|${INSTALLATION_PATH}|g" "${jukebox_service}"
-  sudo chmod 644 "${jukebox_service}"
+  sudo cp -f "${INSTALLATION_PATH}/resources/default-services/jukebox-daemon.service" "${JUKEBOX_SERVICE_NAME}"
+  sudo sed -i "s|%%INSTALLATION_PATH%%|${INSTALLATION_PATH}|g" "${JUKEBOX_SERVICE_NAME}"
+  sudo chmod 644 "${JUKEBOX_SERVICE_NAME}"
 
   systemctl --user daemon-reload
   systemctl --user enable jukebox-daemon.service
@@ -145,6 +144,8 @@ _jukebox_core_check () {
         pulseaudio pulseaudio-module-bluetooth pulseaudio-utils caps \
         libasound2-dev \
 
+    verify_dirs_exist "${VIRTUAL_ENV}"
+
     local pip_modules=$(get_args_from_file "${INSTALLATION_PATH}/requirements.txt")
     verify_pip_modules pyzmq $pip_modules
 
@@ -155,7 +156,7 @@ _jukebox_core_check () {
 
     verify_files_chmod_chown 644 root root "${SYSTEMD_USR_PATH}/jukebox-daemon.service"
 
-    verify_file_contains_string "${INSTALLATION_PATH}" "${jukebox_service}"
+    verify_file_contains_string "${INSTALLATION_PATH}" "${JUKEBOX_SERVICE_NAME}"
 
     check_service_enablement jukebox-daemon.service enabled --user
 }