Minor code cleanup

Author: mluypaert

Makefile

@@ -18,7 +18,7 @@ run-all-tests: $(call print-help,run-all-tests,"Run all test against each flavou
 setup-mvn-creds: $(call print-help,setup-mvn-creds,"Setup credentials for maven/clojars")
 	@./scripts/dev-setup.sh
 
-uberjar: $(call print-help,uberjar,"Create uberjar for use in by DB migration pipeline")
+uberjar: $(call print-help,uberjar,"Create uberjar for use in DB migration pipeline")
 	@./scripts/bundle-release.sh
 
 .PHONY: uberjar-for-db-mig deploy-clojars setup-mvn-creds

scripts/bundle-release.sh

@@ -81,7 +81,7 @@ mkdir -p "${BUILD_DIR}/${PROJ_FQNAME}"
 mkdir -p "${RELEASE_DIR}"
 release_file "${RELEASE_TAG}" "${LOG_SORT_SCRIPT}" "${BUILD_DIR}/${PROJ_FQNAME}/$(basename ${LOG_SORT_SCRIPT})"
 make_release_jar "${PWD}" "${JAR_NAME}"
-mv "$(find ./target -name ${PROJ_NAME}-${RELEASE_TAG}-standalone.jar)" "${DEPLOY_JAR}"
+mv "$(find ./target -name ${JAR_NAME})" "${DEPLOY_JAR}"
 cd "${BUILD_DIR}"
 run_step "Creating release archive: ${RELEASE_ARCHIVE}" \
 	 tar cpJf "${RELEASE_ARCHIVE}" "${PROJ_FQNAME}"