Split appimage script and distribution files

cyrilus31 · May 1, 2021 · 4bd1161 · 4bd1161
1 parent a1a7b07
commit 4bd1161
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 2 deletions.
diff --git 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 → dist/duckstation-nogui.desktop b/appimage/duckstation-nogui.desktop → dist/duckstation-nogui.desktop
diff --git a/appimage/duckstation-qt.desktop → dist/duckstation-qt.desktop b/appimage/duckstation-qt.desktop → dist/duckstation-qt.desktop
diff --git a/appimage/icon-16px.png → dist/icon-16px.png b/appimage/icon-16px.png → dist/icon-16px.png
diff --git a/appimage/icon-32px.png → dist/icon-32px.png b/appimage/icon-32px.png → dist/icon-32px.png
diff --git a/appimage/icon-48px.png → dist/icon-48px.png b/appimage/icon-48px.png → dist/icon-48px.png
diff --git a/appimage/icon-64px.png → dist/icon-64px.png b/appimage/icon-64px.png → dist/icon-64px.png
diff --git a/.../org.duckstation.DuckStation.metainfo.xml → .../org.duckstation.DuckStation.metainfo.xml b/.../org.duckstation.DuckStation.metainfo.xml → .../org.duckstation.DuckStation.metainfo.xml
diff --git a/appimage/generate_appimages.sh → scripts/generate_appimages.sh b/appimage/generate_appimages.sh → 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