From 7635739e9ba79a932e5b0e1e708d92eb6ce1ba16 Mon Sep 17 00:00:00 2001
From: SulfurNitride <SulfurNitride@users.noreply.github.com>
Date: Wed, 29 Apr 2026 01:28:24 -0500
Subject: Finalize Linux build cleanup

---
 docker/AppRun.sh      |  6 +++---
 docker/build-inner.sh | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'docker')

diff --git a/docker/AppRun.sh b/docker/AppRun.sh
index 41d1223..e106cce 100644
--- a/docker/AppRun.sh
+++ b/docker/AppRun.sh
@@ -61,7 +61,7 @@ sync_dir_overwrite_files() {
 
 # ── Extract/sync writable dirs ──
 sync_dir_overwrite_files "plugins"
-sync_dir_overwrite_files "dlls"
+sync_dir_overwrite_files "lib"
 sync_dir_overwrite_files "python"
 
 # Some existing Windows portable setups include plugins/plugin_python with
@@ -109,10 +109,10 @@ if [ -d "${HERE}/usr/translations/qtwebengine_locales" ]; then
 fi
 
 # Tell the app to use the writable dirs next to the AppImage.
-# MO2_BASE_DIR overrides qApp->applicationDirPath() for plugin/dll discovery.
+# MO2_BASE_DIR overrides qApp->applicationDirPath() for plugin/library discovery.
 export MO2_BASE_DIR="${APPIMAGE_DIR}"
 export MO2_PLUGINS_DIR="${APPIMAGE_DIR}/plugins"
-export MO2_DLLS_DIR="${APPIMAGE_DIR}/dlls"
+export MO2_LIBS_DIR="${APPIMAGE_DIR}/lib"
 MO2_PYTHON_BUNDLED="${HERE}/usr/share/fluorine/python"
 if [ -d "${MO2_PYTHON_BUNDLED}/lib" ]; then
     export MO2_PYTHON_DIR="${MO2_PYTHON_BUNDLED}"
diff --git a/docker/build-inner.sh b/docker/build-inner.sh
index 15b2efd..957d53e 100755
--- a/docker/build-inner.sh
+++ b/docker/build-inner.sh
@@ -51,7 +51,7 @@ RUNDIR="build/src/src"
 # ── Output layout (staging area — installed to ~/.local/share/fluorine by build-native.sh) ──
 OUT_DIR="/src/build/staging"
 rm -rf "${OUT_DIR}"
-mkdir -p "${OUT_DIR}/plugins" "${OUT_DIR}/dlls" "${OUT_DIR}/lib"
+mkdir -p "${OUT_DIR}/plugins" "${OUT_DIR}/lib"
 
 # ── Main binary + helpers ──
 cp -f "${RUNDIR}/ModOrganizer" "${OUT_DIR}/ModOrganizer-core"
@@ -139,9 +139,9 @@ fi
 
 
 # ── 7z runtime ──
-SO7="build/src/src/dlls/7z.so"
+SO7="build/src/src/lib/7z.so"
 if [ -f "${SO7}" ]; then
-    cp -f "${SO7}" "${OUT_DIR}/dlls/7z.so"
+    cp -f "${SO7}" "${OUT_DIR}/lib/7z.so"
 fi
 
 # ── Project-specific shared libraries ──
@@ -338,7 +338,6 @@ done
 echo "Stripping MO2 binaries..."
 strip --strip-unneeded "${OUT_DIR}/ModOrganizer-core" 2>/dev/null || true
 find "${OUT_DIR}/plugins" -name "*.so" -exec strip --strip-unneeded {} \; 2>/dev/null || true
-find "${OUT_DIR}/dlls" -name "*.so" -o -name "*.dll" | xargs -r strip --strip-unneeded 2>/dev/null || true
 find "${OUT_DIR}/lib" -name "*.so" -exec strip --strip-unneeded {} \; 2>/dev/null || true
 
 # ── Fix RPATH so binaries find libs without LD_LIBRARY_PATH ──
@@ -479,7 +478,7 @@ export PATH="${RUN}:${PATH}"
 export LD_LIBRARY_PATH="${RUN}/lib"
 export MO2_BASE_DIR="${RUN}"
 export MO2_PLUGINS_DIR="${RUN}/plugins"
-export MO2_DLLS_DIR="${RUN}/dlls"
+export MO2_LIBS_DIR="${RUN}/lib"
 unset PYTHONPATH PYTHONNOUSERSITE PYTHONHOME MO2_PYTHON_DIR
 
 # Use bundled Qt6 plugins.
@@ -718,7 +717,7 @@ export LD_LIBRARY_PATH="${HERE}/usr/lib"
 
 export MO2_BASE_DIR="${APPIMAGE_DIR}"
 export MO2_PLUGINS_DIR="${BIN}/plugins"
-export MO2_DLLS_DIR="${BIN}/dlls"
+export MO2_LIBS_DIR="${BIN}/lib"
 
 unset PYTHONPATH PYTHONNOUSERSITE PYTHONHOME MO2_PYTHON_DIR
 
-- 
cgit v1.3.1