From e55d2263266abaf71bba3734b7292a7b6b8c7e62 Mon Sep 17 00:00:00 2001 From: Trihedraf Date: Mon, 22 Mar 2021 22:05:06 -0700 Subject: [PATCH] update appimage to use devilutionx.mpq and charissilb.ttf --- .circleci/config.yml | 4 ++-- Packaging/nix/AppRun | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Packaging/nix/AppRun diff --git a/.circleci/config.yml b/.circleci/config.yml index c5b311b08..58ea96193 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,9 +15,9 @@ jobs: - run: cmake --build build -j 2 --target package - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64} - run: mkdir ./build/package && find build/_CPack_Packages/Linux/7Z/ -name 'devilutionx' -exec cp "{}" ./build/package/devilutionx \; && cp ./build/package/devilutionx ./build/devilutionx && cp ./Packaging/resources/devilutionx.mpq ./build/package/devilutionx.mpq && mv ./build/devilutionx*.deb ./build/package/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/package/devilutionx.rpm && mv ./build/CharisSILB.ttf ./build/package/CharisSILB.ttf && cp ./Packaging/nix/README.txt ./build/package/README.txt && cp ./Packaging/resources/LICENSE.CharisSILB.txt ./build/package/LICENSE.CharisSILB.txt - - run: make install -Cbuild DESTDIR=AppDir + - run: make install -Cbuild DESTDIR=AppDir && mv build/AppDir/usr/share/diasurgical/devilutionx/devilutionx.mpq build/AppDir/usr/bin/devilutionx.mpq - run: wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage - - run: ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir=build/AppDir --output appimage && mv DevilutionX*.AppImage devilutionx.appimage + - run: ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir=build/AppDir --custom-apprun=Packaging/nix/AppRun --output appimage && mv DevilutionX*.AppImage devilutionx.appimage - run: cd ./build/package/ && tar -cavf ../../devilutionx.tar.xz * && cd ../../ - store_artifacts: {path: ./devilutionx.appimage, destination: devilutionx_linux_x86_64.appimage} - store_artifacts: {path: ./devilutionx.tar.xz, destination: devilutionx_linux_x86_64.tar.xz} diff --git a/Packaging/nix/AppRun b/Packaging/nix/AppRun new file mode 100644 index 000000000..03b8db7a7 --- /dev/null +++ b/Packaging/nix/AppRun @@ -0,0 +1,2 @@ +#!/bin/sh +$APPDIR/usr/bin/devilutionx --ttf-file $APPDIR/usr/share/fonts/truetype/CharisSILB.ttf