diff --git a/installation/includes/02_helpers.sh b/installation/includes/02_helpers.sh index 92d6754e0..c0a9aa0d1 100644 --- a/installation/includes/02_helpers.sh +++ b/installation/includes/02_helpers.sh @@ -55,20 +55,19 @@ get_version_string() { local version_minor local version_patch - version_major=$(grep 'VERSION_MAJOR\s*=\s*[0-9]*' "$python_file" | awk -F= '{print $2}' | tr -d ' ') - version_minor=$(grep 'VERSION_MINOR\s*=\s*[0-9]*' "$python_file" | awk -F= '{print $2}' | tr -d ' ') - version_patch=$(grep 'VERSION_PATCH\s*=\s*[0-9]*' "$python_file" | awk -F= '{print $2}' | tr -d ' ') + version_major=$(grep 'VERSION_MAJOR\s*=\s*[0-9]*' "${python_file}" | awk -F= '{print $2}' | tr -d ' ') + version_minor=$(grep 'VERSION_MINOR\s*=\s*[0-9]*' "${python_file}" | awk -F= '{print $2}' | tr -d ' ') + version_patch=$(grep 'VERSION_PATCH\s*=\s*[0-9]*' "${python_file}" | awk -F= '{print $2}' | tr -d ' ') if [ -n "$version_major" ] && [ -n "$version_minor" ] && [ -n "$version_patch" ]; then local version_string="${version_major}.${version_minor}.${version_patch}" - echo "$version_string" + echo "Jukebox Version: ${version_string}" else - echo "Unable to extract version information from $python_file" + echo "Unable to extract version information from ${python_file}" fi } ### Verify helpers - print_verify_installation() { echo "" echo " -------------------------------------------------------" diff --git a/installation/routines/setup_jukebox_webapp.sh b/installation/routines/setup_jukebox_webapp.sh index b7837c29a..881b27468 100644 --- a/installation/routines/setup_jukebox_webapp.sh +++ b/installation/routines/setup_jukebox_webapp.sh @@ -55,7 +55,7 @@ _jukebox_webapp_build() { _jukebox_webapp_download() { echo " Downloading web application" | tee /dev/fd/3 - local JUKEBOX_VERSION==$(get_version_string "${INSTALLATION_PATH}/src/jukebox/jukebox/version.py") + local JUKEBOX_VERSION=$(get_version_string "${INSTALLATION_PATH}/src/jukebox/jukebox/version.py") local TAR_FILENAME="webapp-build.tar.gz" cd "${INSTALLATION_PATH}/src/webapp" || exit_on_error