diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 001e392d..e13786b3 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -24,4 +24,4 @@ jobs: uses: softprops/action-gh-release@v3 if: "${{ github.event_name != 'workflow_dispatch' }}" with: - files: Skyscraper-*.AppImage + files: Skyscraper-*.AppImage* diff --git a/src/compositor.cpp b/src/compositor.cpp index 477b9453..8c6fe209 100644 --- a/src/compositor.cpp +++ b/src/compositor.cpp @@ -294,7 +294,7 @@ GameEntry::Types Compositor::saveAll(GameEntry &game, QString completeBaseName, bool esdeMiximage) { bool createSubfolder = false; QString fn = "/" % completeBaseName; - QString subPath = getSubpath(game.path); + QString subPath = getMediaSubpath(game.path); if (subPath != ".") { fn.prepend("/" % subPath); createSubfolder = true; @@ -581,7 +581,7 @@ void Compositor::processChildLayers(GameEntry &game, Layer &layer) { } } -QString Compositor::getSubpath(const QString &absPath) { +QString Compositor::getMediaSubpath(const QString &absPath) { QString subPath = "."; if (config->frontend == "esde") { // ES-DE expects media files in same subpath (tree structure) as diff --git a/src/compositor.h b/src/compositor.h index 441e8c04..8ea32854 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -42,8 +42,7 @@ class Compositor : public QObject { void processXml(); GameEntry::Types saveAll(GameEntry &game, QString completeBaseName, bool isEsde); - // TODO: check, does member fit in here? - QString getSubpath(const QString &absPath); + QString getMediaSubpath(const QString &absPath); private: void addChildLayers(Layer &layer, QXmlStreamReader &xml); diff --git a/src/scraperworker.cpp b/src/scraperworker.cpp index 64aa685e..121026d0 100644 --- a/src/scraperworker.cpp +++ b/src/scraperworker.cpp @@ -335,7 +335,7 @@ void ScraperWorker::run() { } // copy extra media files (not part of compositor/artwork) const QString baseName = info.completeBaseName(); - const QString subPath = compositor.getSubpath(game.path); + const QString subPath = compositor.getMediaSubpath(game.path); frontend->copyMedia(mediaSaved, baseName, subPath, game); } diff --git a/supplementary/workflows/appimage b/supplementary/workflows/appimage index 08f57173..77486a4b 100644 --- a/supplementary/workflows/appimage +++ b/supplementary/workflows/appimage @@ -26,11 +26,11 @@ function build_appimage() { local _xdg="${1:-}" make --ignore-errors distclean || true #sed -i "0,/CONFIG += /{s/CONFIG.*/CONFIG += debug/}" skyscraper.pro - #sed '/claudio/{s//claudia/;:p;n;bp}' # set XDG [[ -n "$_xdg" ]] && sed -i "/DEFINES += XDG/{s/#DEFINES/DEFINES/}" skyscraper.pro # unset XDG [[ -z "$_xdg" ]] && sed -i "/#*DEFINES += XDG/{s//#DEFINES += XDG/}" skyscraper.pro + PREFIX=/usr SYSCONFDIR=/etc qmake6 skyscraper.pro jobs=$(getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu) rm -rf "$app_dir" || true @@ -44,7 +44,9 @@ function build_appimage() { GLIBC_BASE="2.35" # Ubuntu 22.04 / Debian Bookworm (12) #GLIBC_BASE="2.39" # Ubuntu 24.04 / Debian Trixie (13) build_host_glibc=$(readelf -V "$app_dir"/usr/bin/Skyscraper 2>/dev/null | grep -o 'GLIBC_[0-9.]*' | sort -V | tail -1| cut -d _ -f2) + echo "[*] Testing if Glibc baseline version is matched ..." dpkg --compare-versions "$build_host_glibc" le $GLIBC_BASE + echo "[+] ... OK" cat >skyscraper.desktop <