diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-05-01 10:09:39 -0500 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-05-01 10:09:39 -0500 |
| commit | af43100e29859adbf5dcb6ee90cd8f981439b859 (patch) | |
| tree | 6d51db8b4f0b77cf4443cb2f49c4e5a7c354d7b6 /docker/AppRun.sh | |
| parent | 5d1fb2964a172e3444f18ca2ea823ee36784e699 (diff) | |
Remove AppImage build target and runtime references
We ship via portable tarball directory + .bin self-extracting installer
only; the AppImage path was unmaintained and pulling in linuxdeploy
tooling for a format we no longer publish.
Build:
- build.sh: drop appimage/all-includes-appimage modes (now: tarball,
installer, all=both, shell). Output listing tracks the directory.
- docker/Dockerfile: drop BUILD_APPIMAGE arg and the linuxdeploy
download/extract block.
- docker/build-inner.sh: drop build_appimage() (~120 lines), AppImage
arm of the BUILD_MODE switch, *.AppImage summary listing.
- docker/AppRun.sh: deleted.
- .gitignore: drop *.AppImage / squashfs-root / *.flatpak entries.
Runtime: no longer key off APPIMAGE/APPDIR env vars or AppRun-set
state. The fluorine-manager launcher script already exports
FLUORINE_ORIG_*, MO2_BASE_DIR, MO2_PLUGINS_DIR, MO2_LIBS_DIR,
MO2_PYTHON_DIR for the same purpose, so simplify:
- envshortcut: appImageOrBinary -> launcherOrBinary; bundledFluorineIcon
no longer probes APPDIR.
- nxmhandler: drop APPIMAGE-based wrapper path; use applicationFilePath.
- protonlauncher: rename cleanAppImageEnv -> cleanFluorineEnv, drop
APPIMAGE/APPDIR/OWD/ARGV0/APPIMAGE_ORIGINAL_EXEC/DESKTOPINTEGRATION
removals and .mount_Fluori pattern strip.
- prefixsetuprunner: same env-cleaning trim.
- utility, library.h, proxypython, mainwindow, moapplication, appconfig:
comment cleanup pointing at the launcher instead of AppRun.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'docker/AppRun.sh')
| -rw-r--r-- | docker/AppRun.sh | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/docker/AppRun.sh b/docker/AppRun.sh deleted file mode 100644 index 145ac61..0000000 --- a/docker/AppRun.sh +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash -HERE="$(dirname "$(readlink -f "$0")")" -APPIMAGE_DIR="$(dirname "$(readlink -f "${APPIMAGE:-$0}")")" - -cleanup_stale_fuse_mounts() { - local root="$1" - [ -n "${root}" ] || return 0 - [ -r /proc/mounts ] || return 0 - - local src mp fstype rest mount_path stat_out - while IFS=' ' read -r src mp fstype rest; do - # Decode escaped paths from /proc/mounts. - mount_path="${mp//\\040/ }" - mount_path="${mount_path//\\011/$'\t'}" - mount_path="${mount_path//\\012/$'\n'}" - - case "${mount_path}" in - "${root}"/*) ;; - *) continue ;; - esac - - case "${fstype}" in - fuse*|fuse.*) ;; - *) continue ;; - esac - - stat_out="$(LC_ALL=C stat "${mount_path}" 2>&1 || true)" - if printf "%s" "${stat_out}" | grep -Eq "Transport endpoint is not connected|Stale file handle|Input/output error"; then - echo "[Fluorine] Recovering stale FUSE mount: ${mount_path}" - fusermount3 -uz "${mount_path}" >/dev/null 2>&1 || \ - fusermount -uz "${mount_path}" >/dev/null 2>&1 || \ - umount -l "${mount_path}" >/dev/null 2>&1 || true - fi - done < /proc/mounts -} - -cleanup_stale_fuse_mounts "${APPIMAGE_DIR}" - -sync_dir_overwrite_files() { - local name="$1" - local src="${HERE}/usr/share/fluorine/${name}" - local dst="${APPIMAGE_DIR}/${name}" - - [ -d "${src}" ] || return 0 - - if [ ! -d "${dst}" ]; then - echo "[Fluorine] First run: extracting ${name}/ next to AppImage..." - else - echo "[Fluorine] Updating ${name}/ bundled files..." - fi - mkdir -p "${dst}" - # Merge bundled payload while skipping VCS metadata (.git, etc.). - ( - cd "${src}" - tar --exclude-vcs -cf - . - ) | ( - cd "${dst}" - tar -xf - - ) -} - -# ── Extract/sync writable dirs ── -sync_dir_overwrite_files "plugins" -sync_dir_overwrite_files "lib" -sync_dir_overwrite_files "python" - -# Some existing Windows portable setups include plugins/plugin_python with -# .pyd/.dll payload. On Linux, the proxy will prefer this folder if present, -# which can hide the correct Linux mobase module. Overlay Linux runtime files -# into that folder to keep compatibility without deleting user content. -if [ -d "${APPIMAGE_DIR}/plugins/plugin_python" ]; then - if find "${APPIMAGE_DIR}/plugins/plugin_python" -type f \( -name '*.pyd' -o -name 'python*.dll' \) | grep -q .; then - echo "[Fluorine] Detected Windows plugin_python payload, overlaying Linux runtime files..." - mkdir -p "${APPIMAGE_DIR}/plugins/plugin_python/libs" - [ -d "${APPIMAGE_DIR}/plugins/libs" ] && cp -a "${APPIMAGE_DIR}/plugins/libs/." "${APPIMAGE_DIR}/plugins/plugin_python/libs/" - PYTHON_ROOT_CANDIDATE="${HERE}/usr/share/fluorine/python" - [ -d "${PYTHON_ROOT_CANDIDATE}/lib" ] || PYTHON_ROOT_CANDIDATE="${APPIMAGE_DIR}/python" - if [ -d "${PYTHON_ROOT_CANDIDATE}/lib" ]; then - PYVER_DIR="$(find "${PYTHON_ROOT_CANDIDATE}/lib" -mindepth 1 -maxdepth 1 -type d -name 'python3.*' | head -n 1)" - if [ -n "${PYVER_DIR}" ]; then - SITE_DIR="${PYVER_DIR}/site-packages" - [ -d "${SITE_DIR}/PyQt6" ] && cp -a "${SITE_DIR}/PyQt6" "${APPIMAGE_DIR}/plugins/plugin_python/libs/" - [ -d "${SITE_DIR}/PyQt6_sip" ] && cp -a "${SITE_DIR}/PyQt6_sip" "${APPIMAGE_DIR}/plugins/plugin_python/libs/" - [ -d "${SITE_DIR}/sip" ] && cp -a "${SITE_DIR}/sip" "${APPIMAGE_DIR}/plugins/plugin_python/libs/" - fi - fi - fi -fi - -# ── Environment ── -# Save original LD_LIBRARY_PATH so child processes (xdg-open, kde-open, etc.) -# can use host libraries instead of the bundled (potentially older) ones. -export FLUORINE_ORIG_LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}" -export PATH="${HERE}/usr/bin:${HERE}/usr/libexec:${PATH}" -export LD_LIBRARY_PATH="${HERE}/usr/lib:${HERE}/usr/libexec:${LD_LIBRARY_PATH:-}" - -# Qt plugins (read-only, inside AppImage) -export QT_PLUGIN_PATH="${HERE}/usr/plugins" -export QT_QPA_PLATFORM_PLUGIN_PATH="${HERE}/usr/plugins/platforms" -if [ -x "${HERE}/usr/libexec/QtWebEngineProcess" ]; then - export QTWEBENGINEPROCESS_PATH="${HERE}/usr/libexec/QtWebEngineProcess" -fi -if [ -d "${HERE}/usr/resources" ]; then - export QTWEBENGINE_RESOURCES_PATH="${HERE}/usr/resources" -fi -if [ -d "${HERE}/usr/translations/qtwebengine_locales" ]; then - export QTWEBENGINE_LOCALES_PATH="${HERE}/usr/translations/qtwebengine_locales" -fi - -# Tell the app to use the writable dirs next to the AppImage. -# 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_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}" -else - export MO2_PYTHON_DIR="${APPIMAGE_DIR}/python" -fi -# Do not export PYTHONHOME/PYTHONPATH globally here. MO2 sets Python runtime -# internally for plugin_python, while child processes (NaK/launchers) must -# use their own system Python environment. -unset PYTHONHOME PYTHONPATH PYTHONNOUSERSITE - -# Raise open file descriptor limit — large modlists with FUSE VFS -# can easily exceed the default 1024 -ulimit -n 65536 2>/dev/null - -cd "${APPIMAGE_DIR}" -exec "${HERE}/usr/bin/ModOrganizer.bin" "$@" |
