From db63248677bb886fb2b7e6162a04c339e34ac021 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Wed, 2 Dec 2020 23:40:36 +0100
Subject: [PATCH] Some build file fixes

---
 server/repro/build.sh              |  7 +++++++
 server/repro/generate_libraries.sh |  6 ------
 server/repro/package_server.sh     | 17 +++++++++++------
 shared                             |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/server/repro/build.sh b/server/repro/build.sh
index 934ef0f..95bce10 100755
--- a/server/repro/build.sh
+++ b/server/repro/build.sh
@@ -11,6 +11,7 @@ cp env/buildVersion.txt .
 rm -r env
 mkdir env
 cd env
+
 [[ $? -ne 0 ]] && {
   echo "Failed to create the env"
   exit 1
@@ -49,6 +50,12 @@ mv buildVersion.txt env/buildVersion.txt
     exit 1
 }
 
+
+./make_symbol.sh || {
+    echo "Failed to generate debug symbols"
+    exit 1
+}
+
 ./package_server.sh "${BUILD_PATH}" || {
     echo "Failed to package server! ($?)"
     exit 1
diff --git a/server/repro/generate_libraries.sh b/server/repro/generate_libraries.sh
index 35bf461..e05e425 100755
--- a/server/repro/generate_libraries.sh
+++ b/server/repro/generate_libraries.sh
@@ -61,10 +61,4 @@ cp "${library_path}" . || { echo "failed to copy libteaspeak_rtc.so"; exit 1; }
 
 # Doing some prostprocessing
 chmod 755 *
-for file in *.so*; do
-    echo "Editing rpath for $file"
-    strip --strip-all "$file"
-    patchelf --set-rpath "./libs/:./" "$file"
-done
-
 echo "All libraries have been copied successfully"
diff --git a/server/repro/package_server.sh b/server/repro/package_server.sh
index 0164393..9cf4fb8 100755
--- a/server/repro/package_server.sh
+++ b/server/repro/package_server.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=SC2207
 BUILD_INFO=($(cat build_version.txt))
 BUILD_FULL_NAME=${BUILD_INFO[0]}
 BUILD_NAME=${BUILD_INFO[1]}
@@ -22,18 +23,22 @@ echo -e "# Version: ${BUILD_FULL_NAME}
 
 {\"build_name\": \"${BUILD_FULL_NAME}\", \"build_version\": \"${BUILD_NAME}\", \"build_index\": ${BUILD_VERSION}}" > buildVersion.txt
 
-#Create a copy and save unstripped
-cp TeaSpeakServer TeaSpeakServerTmp
-rm TeaSpeakServer
-mv TeaSpeakServerTmp TeaSpeakServer
-
+echo "Stripping symbols"
 strip -s -p -v TeaSpeakServer || { echo "failed to strip symbols!"; exit 1; }
 patchelf --set-rpath ./libs/ TeaSpeakServer || { echo "failed to set rpath!"; exit 1; }
+
+cd libs/ || exit 1
+for file in *.so*; do
+    echo "Editing rpath for $file"
+    strip --strip-all "$file"
+    patchelf --set-rpath "./libs/:./" "$file"
+done
+cd ..
+
 tar --dereference -cvf - * | gzip -f -9 > "../${BUILD_FILENAME}"
 [[ $? -ne 0 ]] && { echo "failed to package server"; exit 1; }
 
 cd ..
 rm -r finalenv
-./make_symbol.sh
 
 echo "Package created (${BUILD_FILENAME})"
diff --git a/shared b/shared
index 2ba9288..3eedb7d 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 2ba9288cc29f5be47a6862d5c1c3caec0bb6d377
+Subproject commit 3eedb7d77220145b01f3fc7f11e32656b532dcbd