diff --git a/dlbuilder.sh b/dlbuilder.sh index 0dd4b8c4..10506946 100755 --- a/dlbuilder.sh +++ b/dlbuilder.sh @@ -6,7 +6,7 @@ run_mvn() { # run a mvn build to download dependencies from the central maven repo mvn clean compile # remove vulnerable class from log4j jar file - log4j_version_num=`awk '/log4j-core/{getline; print}' pom.xml | awk '{$1=$1};1' ` + log4j_version_num=$(awk '/log4j-core/{getline; print}' pom.xml | awk '{$1=$1};1' ) log4j_version_num=${log4j_version_num#}; log4j_version_num=${log4j_version_num%}; diff --git a/src/main/resources/mac/util/util.sh b/src/main/resources/mac/util/util.sh index 7d563782..3e367b42 100644 --- a/src/main/resources/mac/util/util.sh +++ b/src/main/resources/mac/util/util.sh @@ -19,7 +19,7 @@ checkJavaVersion() { initVars echo "Data Loader requires Java JRE ${MIN_JAVA_VERSION} or later. Checking if it is installed..." - if [ ! -z "${DATALOADER_JAVA_HOME}" ] + if [ -n "${DATALOADER_JAVA_HOME}" ] then JAVA_HOME=${DATALOADER_JAVA_HOME} fi @@ -43,11 +43,11 @@ exitWithJavaDownloadMessage() { echo "Java JRE ${MIN_JAVA_VERSION} or later is not installed or DATALOADER_JAVA_HOME environment variable is not set." echo "For example, download and install Zulu JRE ${MIN_JAVA_VERSION} or later from here:" echo " https://www.azul.com/downloads/" - exit -1 + exit 1 } runDataLoader() { checkJavaVersion SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - java -cp "${SCRIPT_DIR}/../*" com.salesforce.dataloader.process.DataLoaderRunner $@ + java -cp "${SCRIPT_DIR}/../*" com.salesforce.dataloader.process.DataLoaderRunner "$@" } \ No newline at end of file