fixup! Standardize downloads with a shared script

Author: JohT

scripts/download.sh

@@ -56,7 +56,7 @@ fi
 
 # Download the file if it doesn't exist in the shared downloads directory 
 if [ ! -f "${SHARED_DOWNLOADS_DIRECTORY}/${filename}" ] ; then
-    echo "download: Downloading ${filename} from ${downloadUrl}"
+    echo "download: Downloading ${filename} from ${downloadUrl} into ${SHARED_DOWNLOADS_DIRECTORY}"
 
     # Download the file
     if ! curl -L --fail-with-body -o "${SHARED_DOWNLOADS_DIRECTORY}/${filename}" "${downloadUrl}"; then

scripts/downloadMavenArtifact.sh

@@ -13,6 +13,7 @@
 # Overrideable constants
 ARTIFACTS_DIRECTORY=${ARTIFACTS_DIRECTORY:-"artifacts"}
 SHARED_DOWNLOADS_DIRECTORY="${SHARED_DOWNLOADS_DIRECTORY:-$(dirname "$( pwd )")/downloads}"
+echo "downloadMavenArtifact: SHARED_DOWNLOADS_DIRECTORY=${SHARED_DOWNLOADS_DIRECTORY}" # TODO deactivate, only for debugging
 
 # Default and initial values for command line options
 groupId=""
@@ -58,7 +59,7 @@ fi
 # CDPATH reduces the scope of the cd command to potentially prevent unintended directory changes.
 # This way non-standard tools like readlink aren't needed.
 SCRIPTS_DIR=${SCRIPTS_DIR:-$( CDPATH=. cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P )}
-#echo "downloadMavenArtifact: SCRIPTS_DIR=$SCRIPTS_DIR"
+echo "downloadMavenArtifact: SCRIPTS_DIR=$SCRIPTS_DIR" # TODO deactivate, only for debugging
 
 # Internal constants
 BASE_URL="https://repo1.maven.org/maven2"

scripts/downloader/downloadAxonFramework.sh

@@ -32,11 +32,11 @@ echo "download${ANALYSIS_NAME}: ARTIFACTS_VERSION=${ARTIFACTS_VERSION}"
 # Even if $BASH_SOURCE is made for Bourne-like shells it is also supported by others and therefore here the preferred solution. 
 # CDPATH reduces the scope of the cd command to potentially prevent unintended directory changes.
 # This way non-standard tools like readlink aren't needed.
-ANALYSIS_SCRIPT_DIR=${ANALYSIS_SCRIPT_DIR:-$( CDPATH=. cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P )}
-echo "download${ANALYSIS_NAME}: ANALYSIS_SCRIPT_DIR=${ANALYSIS_SCRIPT_DIR}"
+DOWNLOADER_SCRIPTS_DIR=${DOWNLOADER_SCRIPTS_DIR:-$( CDPATH=. cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P )}
+echo "download${ANALYSIS_NAME}: DOWNLOADER_SCRIPTS_DIR=${DOWNLOADER_SCRIPTS_DIR}"
 
 # Get the "scripts" directory by taking the path of this script and going one directory up.
-SCRIPTS_DIR=${SCRIPTS_DIR:-$(dirname -- "${ANALYSIS_SCRIPT_DIR}")}
+SCRIPTS_DIR=${SCRIPTS_DIR:-$(dirname -- "${DOWNLOADER_SCRIPTS_DIR}")}
 echo "download${ANALYSIS_NAME}: SCRIPTS_DIR=${SCRIPTS_DIR}"
 
 ################################################################