From dad0ce7dce773acb10bda8347b6cb2593463442a Mon Sep 17 00:00:00 2001 From: Joel Timothy Oh Date: Sat, 20 Apr 2024 22:59:24 +0000 Subject: [PATCH] Refactor (ci): Utilize variables for `Applying hotfixes for hlds` section --- build/Dockerfile | 6 +++--- update/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index a11ea92b..1a6b24a7 100644 --- 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 index df25da1e..043483df 100644 --- 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