GEODE-5907 patch gradle in a cross-platform-friendly way

apache · Oct 19, 2018 · b4fa47b · b4fa47b
1 parent 4baed05
commit b4fa47b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
@@ -73,13 +73,11 @@ case $ARTIFACT_SLUG in
     JAVA_BUILD_PATH=C:/java${JAVA_BUILD_VERSION}
     JAVA_TEST_PATH=C:/java${JAVA_TEST_VERSION}
     SEP=";"
-    CHMOD=""
     ;;
   *)
     JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
     JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64
     SEP="&&"
-    CHMOD="chmod +x gradlewStrict $SEP"
     ;;
 esac
 
@@ -95,6 +93,6 @@ GRADLE_ARGS=" \
     ${GRADLE_TASK} \
     ${GRADLE_TASK_OPTIONS}"
 
-EXEC_COMMAND="bash -c 'echo Building with: $SEP ${JAVA_BUILD_PATH}/bin/java -version $SEP echo Testing with: $SEP ${JAVA_TEST_PATH}/bin/java -version $SEP cd geode $SEP sed -e 's/JAVA_HOME/GRADLE_JVM/g' < gradlew > gradlewStrict $SEP $CHMOD GRADLE_JVM=${JAVA_BUILD_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
+EXEC_COMMAND="bash -c 'echo Building with: $SEP ${JAVA_BUILD_PATH}/bin/java -version $SEP echo Testing with: $SEP ${JAVA_TEST_PATH}/bin/java -version $SEP cd geode $SEP cp gradlew gradlewStrict $SEP sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.bak gradlewStrict $SEP GRADLE_JVM=${JAVA_BUILD_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
 echo "${EXEC_COMMAND}"
 ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "${EXEC_COMMAND}"