From 8b411d47573e34324f4dc8030403482644017553 Mon Sep 17 00:00:00 2001 From: Petr Bena Date: Mon, 6 Apr 2026 23:27:05 +0200 Subject: [PATCH 1/2] appimage script --- packaging/README.md | 39 ++++++++++ packaging/package-appimage.sh | 142 ++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100755 packaging/package-appimage.sh diff --git a/packaging/README.md b/packaging/README.md index 74db694..84ab00e 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -7,6 +7,7 @@ This directory contains Linux packaging scripts for Tux Manager. - Debian/Ubuntu (`.deb`) via `package-deb.sh` - Fedora/RHEL/Alma/Rocky (`.rpm` + `.src.rpm`) via `package-rpm.sh` - Flatpak (`.flatpak`) via `package-flatpak.sh` +- AppImage (`.AppImage`) via `package-appimage.sh` ## Dependencies @@ -48,6 +49,20 @@ Notes: - The script validates that `flatpak`, `flatpak-builder`, `flathub`, and required runtime/sdk refs are present before building. - The resulting bundle is written to `packaging/output/`. +### AppImage + +Required tools/packages: + +```bash +sudo apt-get install build-essential pkg-config qt6-base-dev +linuxdeployqt --version +``` + +Notes: +- `linuxdeployqt` must be available in `PATH`. +- The script reuses the desktop/icon metadata from `packaging/flatpak/`. +- The resulting AppImage is written to `packaging/output/`. + ## Usage From repo root: @@ -105,6 +120,23 @@ Optional: Output (in `packaging/output/`): - `tux-manager--.flatpak` +### Build AppImage + +```bash +cd packaging +./package-appimage.sh +``` + +Optional: + +```bash +./package-appimage.sh --qt /path/to/qt/bin +./package-appimage.sh --version 1.2.3 +``` + +Output (in `packaging/output/`): +- `tux-manager--.AppImage` + ## Install ### Debian/Ubuntu @@ -126,3 +158,10 @@ sudo dnf install packaging/output/tux-manager-*.rpm flatpak install --user packaging/output/tux-manager-*.flatpak flatpak run io.github.benapetr.TuxManager ``` + +### AppImage + +```bash +chmod +x packaging/output/tux-manager-*.AppImage +./packaging/output/tux-manager-*.AppImage +``` diff --git a/packaging/package-appimage.sh b/packaging/package-appimage.sh new file mode 100755 index 0000000..8413323 --- /dev/null +++ b/packaging/package-appimage.sh @@ -0,0 +1,142 @@ +#!/bin/bash +################################################################################ +# package-appimage.sh - Build and package Tux Manager as an AppImage +################################################################################ + +set -e + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "$SCRIPT_DIR/config" + +PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" +OUTPUT_DIR="$PROJECT_ROOT/packaging/output" +BUILD_DIR="$PROJECT_ROOT/packaging/.appimage-build" +APPDIR="$PROJECT_ROOT/packaging/.AppDir" +DESKTOP_FILE_SRC="$PROJECT_ROOT/packaging/flatpak/io.github.benapetr.TuxManager.desktop" +ICON_FILE_SRC="$PROJECT_ROOT/packaging/flatpak/io.github.benapetr.TuxManager.svg" +METADATA_FILE_SRC="$PROJECT_ROOT/packaging/flatpak/io.github.benapetr.TuxManager.metainfo.xml" + +QT_BIN_PATH="" +NCPUS=$(nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +while [[ $# -gt 0 ]]; do + case "$1" in + --qt) + QT_BIN_PATH="$2" + shift 2 + ;; + --version) + APP_VERSION="$2" + shift 2 + ;; + *) + echo "Unknown option: $1" + echo "Usage: $0 [--qt /path/to/qt/bin] [--version x.y.z]" + exit 1 + ;; + esac +done + +if [ -n "$QT_BIN_PATH" ]; then + export PATH="$QT_BIN_PATH:$PATH" +fi + +echo "=================================" +echo "Building Tux Manager AppImage" +echo "=================================" +echo "CPUs: $NCPUS" +echo "Version: $APP_VERSION" +echo "" + +if [ -z "$QT_BIN_PATH" ]; then + if command -v qmake6 >/dev/null 2>&1; then + QMAKE_CMD="qmake6" + elif command -v qmake >/dev/null 2>&1; then + QMAKE_CMD="qmake" + else + echo "Error: qmake not found in PATH." + echo "Install Qt development tools or use --qt to specify Qt bin path." + exit 1 + fi +else + if command -v qmake6 >/dev/null 2>&1; then + QMAKE_CMD="qmake6" + elif command -v qmake >/dev/null 2>&1; then + QMAKE_CMD="qmake" + else + echo "Error: qmake not found in specified Qt path: $QT_BIN_PATH" + exit 1 + fi +fi + +if ! command -v linuxdeployqt >/dev/null 2>&1; then + echo "Error: linuxdeployqt not found in PATH." + echo "Install linuxdeployqt and re-run." + exit 1 +fi + +if [ ! -f "$DESKTOP_FILE_SRC" ]; then + echo "Error: Desktop file not found: $DESKTOP_FILE_SRC" + exit 1 +fi + +if [ ! -f "$ICON_FILE_SRC" ]; then + echo "Error: Icon file not found: $ICON_FILE_SRC" + exit 1 +fi + +mkdir -p "$OUTPUT_DIR" +rm -rf "$BUILD_DIR" "$APPDIR" +mkdir -p "$BUILD_DIR" \ + "$APPDIR/usr/bin" \ + "$APPDIR/usr/share/applications" \ + "$APPDIR/usr/share/icons/hicolor/scalable/apps" \ + "$APPDIR/usr/share/metainfo" + +echo "Step 1: Building application..." +cd "$BUILD_DIR" +"$QMAKE_CMD" "$PROJECT_ROOT/src/TuxManager.pro" +make -j"$NCPUS" + +echo "" +echo "Step 2: Creating AppDir..." +install -Dm755 "$BUILD_DIR/$APP_NAME" "$APPDIR/usr/bin/$APP_NAME" +install -Dm644 "$DESKTOP_FILE_SRC" "$APPDIR/usr/share/applications/io.github.benapetr.TuxManager.desktop" +install -Dm644 "$ICON_FILE_SRC" "$APPDIR/usr/share/icons/hicolor/scalable/apps/io.github.benapetr.TuxManager.svg" +if [ -f "$METADATA_FILE_SRC" ]; then + install -Dm644 "$METADATA_FILE_SRC" "$APPDIR/usr/share/metainfo/io.github.benapetr.TuxManager.metainfo.xml" +fi + +ln -sf usr/share/applications/io.github.benapetr.TuxManager.desktop "$APPDIR/io.github.benapetr.TuxManager.desktop" +ln -sf usr/share/icons/hicolor/scalable/apps/io.github.benapetr.TuxManager.svg "$APPDIR/io.github.benapetr.TuxManager.svg" + +echo "" +echo "Step 3: Bundling AppImage..." +cd "$PROJECT_ROOT" +rm -f "$PROJECT_ROOT"/*.AppImage +linuxdeployqt \ + "$APPDIR/usr/share/applications/io.github.benapetr.TuxManager.desktop" \ + -appimage \ + -bundle-non-qt-libs \ + -unsupported-allow-new-glibc + +mapfile -t APPIMAGE_FILES < <(find "$PROJECT_ROOT" -maxdepth 1 -type f -name "*.AppImage" | sort) || true +if [ ${#APPIMAGE_FILES[@]} -eq 0 ]; then + echo "Error: linuxdeployqt did not produce an AppImage." + exit 1 +fi + +ARCH="$(uname -m)" +OUTPUT_PATH="$OUTPUT_DIR/${APP_NAME}-${APP_VERSION}-${ARCH}.AppImage" +mv "${APPIMAGE_FILES[0]}" "$OUTPUT_PATH" + +echo "" +echo "=================================" +echo "Build complete!" +echo "=================================" +echo "AppImage: $OUTPUT_PATH" +echo "" +echo "To run:" +echo " chmod +x $OUTPUT_PATH" +echo " $OUTPUT_PATH" +echo "" From 9b290d20e5a634eb14db14a0f5a98225886cc2b2 Mon Sep 17 00:00:00 2001 From: Petr Bena Date: Wed, 8 Apr 2026 14:10:39 +0200 Subject: [PATCH 2/2] refactored to use newer tooling --- packaging/README.md | 18 +++++++++++++++--- packaging/package-appimage.sh | 34 +++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/packaging/README.md b/packaging/README.md index 84ab00e..da51d7e 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -6,9 +6,11 @@ This directory contains Linux packaging scripts for Tux Manager. - Debian/Ubuntu (`.deb`) via `package-deb.sh` - Fedora/RHEL/Alma/Rocky (`.rpm` + `.src.rpm`) via `package-rpm.sh` -- Flatpak (`.flatpak`) via `package-flatpak.sh` - AppImage (`.AppImage`) via `package-appimage.sh` +## Unsupported targets +- Flatpak (`.flatpak`) via `package-flatpak.sh` - runs in container and doesn't allow access to host's /proc + ## Dependencies ### Debian/Ubuntu @@ -37,6 +39,8 @@ Notes: ### Flatpak +NOTE: flatpak doesn't work right now - the resulting app runs in isolation and doesn't have access to /proc so you can't use it to full extent + Required tools/runtime: ```bash @@ -53,13 +57,21 @@ Notes: Required tools/packages: +* https://github.com/linuxdeploy/linuxdeploy +* https://github.com/linuxdeploy/linuxdeploy-plugin-qt +* https://github.com/linuxdeploy/linuxdeploy-plugin-appimage + +Download released appimages from all 3, put them into some directory and create symlinks with bare names, then add this folder to PATH variable + ```bash sudo apt-get install build-essential pkg-config qt6-base-dev -linuxdeployqt --version +linuxdeploy --version +linuxdeploy-plugin-qt --help +linuxdeploy-plugin-appimage --help ``` Notes: -- `linuxdeployqt` must be available in `PATH`. +- `linuxdeploy`, `linuxdeploy-plugin-qt`, and `linuxdeploy-plugin-appimage` must be available in `PATH`. - The script reuses the desktop/icon metadata from `packaging/flatpak/`. - The resulting AppImage is written to `packaging/output/`. diff --git a/packaging/package-appimage.sh b/packaging/package-appimage.sh index 8413323..2177770 100755 --- a/packaging/package-appimage.sh +++ b/packaging/package-appimage.sh @@ -69,9 +69,21 @@ else fi fi -if ! command -v linuxdeployqt >/dev/null 2>&1; then - echo "Error: linuxdeployqt not found in PATH." - echo "Install linuxdeployqt and re-run." +if ! command -v linuxdeploy >/dev/null 2>&1; then + echo "Error: linuxdeploy not found in PATH." + echo "Install linuxdeploy and re-run." + exit 1 +fi + +if ! command -v linuxdeploy-plugin-qt >/dev/null 2>&1; then + echo "Error: linuxdeploy-plugin-qt not found in PATH." + echo "Install linuxdeploy-plugin-qt and re-run." + exit 1 +fi + +if ! command -v linuxdeploy-plugin-appimage >/dev/null 2>&1; then + echo "Error: linuxdeploy-plugin-appimage not found in PATH." + echo "Install linuxdeploy-plugin-appimage and re-run." exit 1 fi @@ -114,15 +126,19 @@ echo "" echo "Step 3: Bundling AppImage..." cd "$PROJECT_ROOT" rm -f "$PROJECT_ROOT"/*.AppImage -linuxdeployqt \ - "$APPDIR/usr/share/applications/io.github.benapetr.TuxManager.desktop" \ - -appimage \ - -bundle-non-qt-libs \ - -unsupported-allow-new-glibc +export QMAKE +QMAKE="$(command -v "$QMAKE_CMD")" + +linuxdeploy \ + --appdir "$APPDIR" \ + --desktop-file "$APPDIR/usr/share/applications/io.github.benapetr.TuxManager.desktop" \ + --icon-file "$APPDIR/usr/share/icons/hicolor/scalable/apps/io.github.benapetr.TuxManager.svg" \ + --plugin qt \ + --output appimage mapfile -t APPIMAGE_FILES < <(find "$PROJECT_ROOT" -maxdepth 1 -type f -name "*.AppImage" | sort) || true if [ ${#APPIMAGE_FILES[@]} -eq 0 ]; then - echo "Error: linuxdeployqt did not produce an AppImage." + echo "Error: linuxdeploy did not produce an AppImage." exit 1 fi