diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 9547f19e9..e0f4e4ae9 100644 --- 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 diff --git a/appimage/duckstation-nogui.desktop b/dist/duckstation-nogui.desktop similarity index 100% rename from appimage/duckstation-nogui.desktop rename to dist/duckstation-nogui.desktop diff --git a/appimage/duckstation-qt.desktop b/dist/duckstation-qt.desktop similarity index 100% rename from appimage/duckstation-qt.desktop rename to dist/duckstation-qt.desktop diff --git a/appimage/icon-16px.png b/dist/icon-16px.png similarity index 100% rename from appimage/icon-16px.png rename to dist/icon-16px.png diff --git a/appimage/icon-32px.png b/dist/icon-32px.png similarity index 100% rename from appimage/icon-32px.png rename to dist/icon-32px.png diff --git a/appimage/icon-48px.png b/dist/icon-48px.png similarity index 100% rename from appimage/icon-48px.png rename to dist/icon-48px.png diff --git a/appimage/icon-64px.png b/dist/icon-64px.png similarity index 100% rename from appimage/icon-64px.png rename to dist/icon-64px.png diff --git a/appimage/org.duckstation.DuckStation.metainfo.xml b/dist/org.duckstation.DuckStation.metainfo.xml similarity index 100% rename from appimage/org.duckstation.DuckStation.metainfo.xml rename to dist/org.duckstation.DuckStation.metainfo.xml diff --git a/appimage/generate_appimages.sh b/scripts/generate_appimages.sh similarity index 98% rename from appimage/generate_appimages.sh rename to scripts/generate_appimages.sh index 28edd75f6..f2d807c04 100755 --- a/appimage/generate_appimages.sh +++ b/scripts/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