From b513ef9da560745a43bde77e18b701b96c348437 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sat, 3 Oct 2020 16:21:46 +0200
Subject: [PATCH] Update Jenkinsfile and setup_variables.sh

---
 Jenkinsfile                        | 2 +-
 jenkins/scripts/setup_variables.sh | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d23d1d0..bf64745 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
 			agent {
 				docker {
 					image 'dockcross/linux-x64'
-					args "-v $JAVA_HOME:/java -v $HOME:/var/maven -v \"${env.WORKSPACE}:/workdir\""
+					args "-v $JAVA_HOME:$JAVA_HOME -v $HOME:/var/maven -v \"${env.WORKSPACE}:/workdir\""
 					reuseNode false
 				}
 			}
diff --git a/jenkins/scripts/setup_variables.sh b/jenkins/scripts/setup_variables.sh
index c6f1ed2..8601b47 100755
--- a/jenkins/scripts/setup_variables.sh
+++ b/jenkins/scripts/setup_variables.sh
@@ -5,7 +5,6 @@ set -e
 export TRAVIS_CPU_ARCH="amd64"
 export TRAVIS_OS_NAME="linux"
 export TRAVIS_BUILD_DIR="/workdir/tdlight-java"
-export JAVA_HOME="/java"
 
 # ====== Variables
 export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight
@@ -65,7 +64,6 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 fi
 
 # ====== Print variables
-echo "JAVA_HOME=${JAVA_HOME}"
 echo "TD_SRC_DIR=${TD_SRC_DIR}"
 echo "TD_BIN_DIR=${TD_BIN_DIR}"
 echo "TDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR}"