From af43100e29859adbf5dcb6ee90cd8f981439b859 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Fri, 1 May 2026 10:09:39 -0500 Subject: 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) --- build.sh | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 27afc98..b57d296 100755 --- a/build.sh +++ b/build.sh @@ -7,8 +7,7 @@ set -euo pipefail # ./build.sh # Build portable .tar.gz (default) # ./build.sh tarball # Build portable .tar.gz only # ./build.sh installer # Build self-extracting .bin installer only -# ./build.sh appimage # Build AppImage (legacy) -# ./build.sh all # Build tarball + AppImage (if available) +# ./build.sh all # Build tarball + installer # ./build.sh shell # Drop into the build container for debugging # # Prerequisites: Docker or Podman @@ -32,27 +31,20 @@ cd "${SCRIPT_DIR}" # Determine build mode from first argument BUILD_MODE="${1:-tarball}" case "${BUILD_MODE}" in - tarball|installer|appimage|all|shell) ;; + tarball|installer|all|shell) ;; *) - echo "Usage: ./build.sh [tarball|installer|appimage|all|shell]" + echo "Usage: ./build.sh [tarball|installer|all|shell]" echo "" echo " tarball Build portable .tar.gz" echo " installer Build self-extracting .bin installer" - echo " appimage Build AppImage (legacy)" - echo " all Build tarball (+ AppImage if available)" + echo " all Build tarball + installer" echo " shell Drop into build container" exit 1 ;; esac -# Build the Docker image if it doesn't exist or Dockerfile changed. -# Pass BUILD_APPIMAGE=1 only when AppImage builds are requested. echo "=== Ensuring build image is up to date ===" -DOCKER_BUILD_ARGS=() -if [ "${BUILD_MODE}" = "appimage" ] || [ "${BUILD_MODE}" = "all" ]; then - DOCKER_BUILD_ARGS+=(--build-arg BUILD_APPIMAGE=1) -fi -${DOCKER} build "${DOCKER_BUILD_ARGS[@]}" -t "${IMAGE_NAME}" docker/ +${DOCKER} build -t "${IMAGE_NAME}" docker/ # Persistent ccache directory for faster rebuilds. CCACHE_DIR="${HOME}/.cache/fluorine-ccache" @@ -92,5 +84,5 @@ ${DOCKER} run --rm \ echo "" echo "=== Done ===" echo "Build outputs:" -ls -lh build/fluorine-manager.tar.gz build/fluorine-manager.bin build/*.AppImage 2>/dev/null || echo " (none found)" +ls -ldh build/fluorine-manager build/fluorine-manager.bin 2>/dev/null || echo " (none found)" echo "Staging: build/staging/" -- cgit v1.3.1