From 89b3f04f0aa3428fa801c9f472040050e07c1878 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Fri, 18 Feb 2022 23:58:54 +0100
Subject: [PATCH] Bugfix

---
 Dockerfile                                             | 2 --
 scripts/continuous-integration/docker/build-natives.sh | 5 ++---
 scripts/core/setup-variables.sh                        | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb5db06..e310058 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,6 @@ ADD src /usr/src/tdlight-java-natives/src
 
 WORKDIR /usr/src/tdlight-java-natives/
 
-ENV CROSS_BUILD_DEPS_DIR "/usr/src/tdlight-java-natives"
-
 ENV JAVA_HOME="$(find "/usr/lib/jvm/" -maxdepth 1 -type d -iname "java*jdk*" | head -n 1)/"
 ENV JAVA_INCLUDE_PATH="$JAVA_HOME/include"
 
diff --git a/scripts/continuous-integration/docker/build-natives.sh b/scripts/continuous-integration/docker/build-natives.sh
index 8c1f2d5..7e4642e 100644
--- a/scripts/continuous-integration/docker/build-natives.sh
+++ b/scripts/continuous-integration/docker/build-natives.sh
@@ -22,11 +22,10 @@ check_jdk_existance() {
   fi
 }
 
-fix_jdk_path
 if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
 	rm -rf "$CROSS_BUILD_DEPS_DIR" || true
 	mkdir -p "$CROSS_BUILD_DEPS_DIR"
-	cd "$CROSS_BUILD_DEPS_DIR"
+	cd "$CROSS_BUILD_DEPS_DIR" || exit 1
 	# LibZ-Dev
 	apt-get download "zlib1g-dev:${CPU_ARCH_DPKG}"
 	ZLIB1G_DEV_DEB=$(find . -name "zlib1g-dev_*.deb")
@@ -83,7 +82,7 @@ if [[ ! -f "$CROSS_BUILD_DEPS_DIR/ok-012" ]]; then
 
 	touch "$CROSS_BUILD_DEPS_DIR/ok-012"
 fi
-
+fix_jdk_path
 check_jdk_existance
 
 source ./scripts/continuous-integration/github-workflows/install-dependencies.sh
diff --git a/scripts/core/setup-variables.sh b/scripts/core/setup-variables.sh
index ae7aa51..2871c75 100755
--- a/scripts/core/setup-variables.sh
+++ b/scripts/core/setup-variables.sh
@@ -95,7 +95,7 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
       export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++"
     fi
 
-    CROSS_BUILD_DEPS_DIR="$(realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}/"
+    CROSS_BUILD_DEPS_DIR="$(realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}"
     export CROSS_BUILD_DEPS_DIR
   fi