From b09d33e3cb54520d7e6e535bc376f57e2cfe25ca Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@warp.ovh>
Date: Wed, 10 May 2023 10:13:56 +0200
Subject: [PATCH] Change native directory

---
 .github/workflows/scripts/build-archlinux-amd64-ssl3.sh | 4 ++--
 .github/workflows/scripts/build-linux-amd64-ssl1.sh     | 4 ++--
 .github/workflows/scripts/build-linux-amd64-ssl3.sh     | 4 ++--
 .github/workflows/scripts/build-linux-arm64-ssl1.sh     | 4 ++--
 scripts/core/compile_tdjni.sh                           | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/scripts/build-archlinux-amd64-ssl3.sh b/.github/workflows/scripts/build-archlinux-amd64-ssl3.sh
index 02b672c..f08a6b3 100755
--- a/.github/workflows/scripts/build-archlinux-amd64-ssl3.sh
+++ b/.github/workflows/scripts/build-archlinux-amd64-ssl3.sh
@@ -65,6 +65,6 @@ cmake \
   ../src/main/cpp
 cmake --build . --target install --config Release "-j$(nproc)"
 cd ..
-mkdir -p src/main/resources/META-INF/tdlight-jni/
-mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlight-jni/libtdjni.linux-amd64-ssl3.so
+mkdir -p src/main/resources/META-INF/tdlightjni/
+mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-amd64-ssl3.so
 mvn package -Dnative.type.classifier=linux-amd64-ssl3 -Drevision="$REVISION"
diff --git a/.github/workflows/scripts/build-linux-amd64-ssl1.sh b/.github/workflows/scripts/build-linux-amd64-ssl1.sh
index 8bee2cf..a1afabb 100755
--- a/.github/workflows/scripts/build-linux-amd64-ssl1.sh
+++ b/.github/workflows/scripts/build-linux-amd64-ssl1.sh
@@ -87,6 +87,6 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI
   ../src/main/cpp
 cmake --build . --target install --config Release "-j$(nproc)"
 cd ..
-mkdir -p src/main/resources/META-INF/tdlight-jni/
-mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlight-jni/libtdjni.linux-amd64-ssl1.so
+mkdir -p src/main/resources/META-INF/tdlightjni/
+mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-amd64-ssl1.so
 mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux-amd64-ssl1 package
diff --git a/.github/workflows/scripts/build-linux-amd64-ssl3.sh b/.github/workflows/scripts/build-linux-amd64-ssl3.sh
index 960d24b..b38d30a 100755
--- a/.github/workflows/scripts/build-linux-amd64-ssl3.sh
+++ b/.github/workflows/scripts/build-linux-amd64-ssl3.sh
@@ -87,6 +87,6 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI
   ../src/main/cpp
 cmake --build . --target install --config Release "-j$(nproc)"
 cd ..
-mkdir -p src/main/resources/META-INF/tdlight-jni/
-mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlight-jni/libtdjni.linux-amd64-ssl3.so
+mkdir -p src/main/resources/META-INF/tdlightjni/
+mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-amd64-ssl3.so
 mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux-amd64-ssl3 package
diff --git a/.github/workflows/scripts/build-linux-arm64-ssl1.sh b/.github/workflows/scripts/build-linux-arm64-ssl1.sh
index c55d376..99138af 100755
--- a/.github/workflows/scripts/build-linux-arm64-ssl1.sh
+++ b/.github/workflows/scripts/build-linux-arm64-ssl1.sh
@@ -79,6 +79,6 @@ cmake \
   ../src/main/cpp
 cmake --build . --target install --config Release "-j$(nproc)"
 cd ..
-mkdir -p src/main/resources/META-INF/tdlight-jni/
-mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlight-jni/libtdjni.linux-arm64-ssl1.so
+mkdir -p src/main/resources/META-INF/tdlightjni/
+mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-arm64-ssl1.so
 mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux-arm64-ssl1 package
diff --git a/scripts/core/compile_tdjni.sh b/scripts/core/compile_tdjni.sh
index 3f27377..524cfa8 100755
--- a/scripts/core/compile_tdjni.sh
+++ b/scripts/core/compile_tdjni.sh
@@ -119,13 +119,13 @@ cd ..
 
 # Copy to resources
 echo "Copying to resources..."
-[ -d  ./src/main/resources/META-INF/tdlight-jni/ ] || mkdir -p ./src/main/resources/META-INF/tdlight-jni/
+[ -d  ./src/main/resources/META-INF/tdlightjni/ ] || mkdir -p ./src/main/resources/META-INF/tdlightjni/
 if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
-	cp ./tdjni_bin/tdjni.dll ./src/main/resources/META-INF/tdlight-jni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.dll
+	cp ./tdjni_bin/tdjni.dll ./src/main/resources/META-INF/tdlightjni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.dll
 elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
-	cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/META-INF/tdlight-jni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.dylib
+	cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/META-INF/tdlightjni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.dylib
 elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
-	cp ./tdjni_bin/libtdjni.so ./src/main/resources/META-INF/tdlight-jni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.so
+	cp ./tdjni_bin/libtdjni.so ./src/main/resources/META-INF/tdlightjni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.so
 fi
 
 echo "Done."