From b6ca0adb3f902e3803cd56dc38a541d872c070d0 Mon Sep 17 00:00:00 2001 From: dio Date: Tue, 17 Oct 2017 06:59:13 +0200 Subject: [PATCH 1/2] scripts now accept any dataloader version --- bin/encrypt.sh | 2 +- bin/process.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/encrypt.sh b/bin/encrypt.sh index e23590d..b3d045c 100755 --- a/bin/encrypt.sh +++ b/bin/encrypt.sh @@ -6,5 +6,5 @@ if [ "$JAVA" == "" ]; then echo "Unable to find Java Runtime in PATH"; exit -1; else - $JAVA -cp dataloader-30.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil "$@" | sed 's/^.*) \- //g' + $JAVA -cp dataloader-*-uber.jar com.salesforce.dataloader.security.EncryptionUtil "$@" | sed 's/^.*) \- //g' fi diff --git a/bin/process.sh b/bin/process.sh index d4409b7..ab912a1 100755 --- a/bin/process.sh +++ b/bin/process.sh @@ -26,6 +26,6 @@ if [ "$JAVA" == "" ]; then echo "Unable to find Java Runtime in PATH" exit -1 else - $JAVA -cp dataloader-30.0.0-uber.jar -Dsalesforce.config.dir=$CONF_DIR com.salesforce.dataloader.process.ProcessRunner process.name=$PROCESS + $JAVA -cp dataloader-*-uber.jar -Dsalesforce.config.dir=$CONF_DIR com.salesforce.dataloader.process.ProcessRunner process.name=$PROCESS fi From b9ec33b811fe31c74edbacc942b1390b38d92f92 Mon Sep 17 00:00:00 2001 From: dio Date: Tue, 17 Oct 2017 07:02:58 +0200 Subject: [PATCH 2/2] mentioned v40 working as well in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09d75e5..feaf140 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The open source version of dataloader is available from: https://github.com/forc 1. Java 1.6+, available in the PATH 2. DataLoader JAR file from Windows or built from the open source project. -(The current name/version of the jar file is: dataloader-30.0.0-uber.jar) +(The current name/version of the jar file is: dataloader-30.0.0-uber.jar, tested with 40.0.0 as well.) ##Steps: