Split appimage script and distribution files

2021-05-01 13:26:32 +02:00 · 2021-05-01 13:26:32 +02:00 · 4bd1161ac9
parent a1a7b073d5
commit 4bd1161ac9
9 changed files with 2 additions and 2 deletions
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@ -175,7 +175,7 @@ jobs:
        cd build
        cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_NOGUI_FRONTEND=ON -DBUILD_QT_FRONTEND=ON -DUSE_DRMKMS=ON -DUSE_EGL=ON -DUSE_SDL2=ON -DUSE_WAYLAND=ON -DUSE_X11=ON -G Ninja ..
        ninja
-        ../appimage/generate_appimages.sh $(pwd)
+        ../scripts/generate_appimages.sh $(pwd)

    - name: Upload NoGUI AppImage
      uses: actions/upload-artifact@v1
--- a/appimage/duckstation-nogui.desktop
+++ b/appimage/duckstation-nogui.desktop
--- a/appimage/duckstation-qt.desktop
+++ b/appimage/duckstation-qt.desktop
--- a/appimage/icon-16px.png
+++ b/appimage/icon-16px.png
--- a/appimage/icon-32px.png
+++ b/appimage/icon-32px.png
--- a/appimage/icon-48px.png
+++ b/appimage/icon-48px.png
--- a/appimage/icon-64px.png
+++ b/appimage/icon-64px.png
--- a/appimage/org.duckstation.DuckStation.metainfo.xml
+++ b/appimage/org.duckstation.DuckStation.metainfo.xml
--- a/appimage/generate_appimages.sh
+++ b/appimage/generate_appimages.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 # NOTE: Keep this script in the same directory as resources for AppImage creation
-APPIMAGE_RESOURCES_DIR=$(dirname $(readlink -f $0))
+APPIMAGE_RESOURCES_DIR=$(dirname $(readlink -f $0))/../dist
 echo "APPIMAGE_RESOURCES_DIR set to ${APPIMAGE_RESOURCES_DIR}"

 if [[ "$#" -ne 1 ]]; then