Refactor (ci): Utilize variables for Applying hotfixes for hlds sec…

…tion
startersclan · Apr 20, 2024 · dad0ce7 · dad0ce7
1 parent 4865c48
commit dad0ce7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -117,9 +117,9 @@ RUN echo "[BUILD] Applying game fixes"; \
     if [ "$APPID" = 90 ]; then \
         echo "[UPDATE] Applying hotfixes for hlds"; \
         # Hotfix "Error:./libstdc++.so.6: version CXXABI_1.3.8' not found"
-        ln -sfnv /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 /server/libgcc_s.so.1; \
-        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /server/libstdc++.so.6; \
-        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /steamcmd/linux32/libstdc++.so.6; \
+        ln -sfnv /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 "$SERVER_DIR/libgcc_s.so.1"; \
+        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 "$SERVER_DIR/libstdc++.so.6"; \
+        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 "$STEAMCMD_DIR/linux32/libstdc++.so.6"; \
     fi; \
     # Create necessary symlinks for srcds/cs2
     if  [ "$APPID" = 730 ]; then \

diff --git a/update/Dockerfile b/update/Dockerfile
@@ -45,9 +45,9 @@ RUN --mount=type=secret,id=STEAM_USERNAME \
     if [ "$APPID" = 90 ]; then \
         echo "[UPDATE] Applying hotfixes for hlds"; \
         # Hotfix "Error:./libstdc++.so.6: version CXXABI_1.3.8' not found"
-        ln -sfnv /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 /server/libgcc_s.so.1; \
-        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /server/libstdc++.so.6; \
-        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /steamcmd/linux32/libstdc++.so.6; \
+        ln -sfnv /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 "$SERVER_DIR/libgcc_s.so.1"; \
+        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 "$SERVER_DIR/libstdc++.so.6"; \
+        ln -sfnv /usr/lib/x86_64-linux-gnu/libstdc++.so.6 "$STEAMCMD_DIR/linux32/libstdc++.so.6"; \
     fi; \
     echo "[UPDATE] Performing cleanup"; \
     # Clean up a different set of files for srcds/cs2