Move dist files into extras

dist/org.duckstation.DuckStation.metainfo.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.duckstation.DuckStation</id>
-  <launchable type="desktop-id">org.duckstation.DuckStation.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0</project_license>
-  <name>DuckStation</name>
-  <summary>PlayStation 1/PSX emulator.</summary>
-  <description>
-    <p>
-      DuckStation is an simulator/emulator of the Sony PlayStation(TM) console, focusing on playability, speed, and long-term maintainability.
-      The goal is to be as accurate as possible while maintaining performance suitable for low-end devices.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default"><image>https://github.com/stenzek/duckstation/raw/md-images/bigduck.png</image></screenshot>
-    <screenshot><image>https://github.com/stenzek/duckstation/raw/md-images/main.png</image></screenshot>
-    <screenshot><image>https://github.com/stenzek/duckstation/raw/md-images/gamegrid.png</image></screenshot>
-    <screenshot><image>https://github.com/stenzek/duckstation/raw/md-images/tof.jpg</image></screenshot>
-  </screenshots>
-  <categories>
-    <category>Games</category>
-    <category>Emulator</category>
-  </categories>
-  <url type="homepage">https://duckstation.org/</url>
-  <url type="bugtracker">https://github.com/stenzek/duckstation/issues</url>
-  <url type="help">https://www.duckstation.org/wiki/Main_Page</url>
-  <developer_name>Connor McLaughlin</developer_name>
-  <content_rating type="oars-1.1" />
-  <releases>
-    <release date="2021-04-24" version="nightly" />
-  </releases>
-</component>

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))/../dist
+APPIMAGE_RESOURCES_DIR=$(dirname $(readlink -f $0))/../extras
 echo "APPIMAGE_RESOURCES_DIR set to ${APPIMAGE_RESOURCES_DIR}"
 
 if [[ "$#" -ne 1 ]]; then
@@ -32,13 +32,13 @@ FRONTENDS=("qt" "nogui")
 ICONS_QT=()
 ICONS_NOGUI=()
 
-for filename in ${APPIMAGE_RESOURCES_DIR}/icon-*px.png; do
+for filename in ${APPIMAGE_RESOURCES_DIR}/icons/icon-*px.png; do
-  [[ ${filename} =~ ${APPIMAGE_RESOURCES_DIR}/icon-(.*)px.png ]];
+  [[ ${filename} =~ ${APPIMAGE_RESOURCES_DIR}/icons/icon-(.*)px.png ]];
   res=${BASH_REMATCH[1]}
   mkdir -p ${BUILD_DIR}/AppImage-icons/${res}x${res}
   for frontend in ${FRONTENDS[@]}; do
     # Copy icon to proper directory
-    cp -v ${APPIMAGE_RESOURCES_DIR}/icon-${res}px.png ${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png
+    cp -v ${APPIMAGE_RESOURCES_DIR}/icons/icon-${res}px.png ${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png
     # Append icon filepath to array that will later be passed to linuxdeploy
     eval "ICONS_${frontend^^}+=(${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png)"
   done
@@ -68,7 +68,7 @@ done
 ${BUILD_DIR}/linuxdeploy-x86_64.AppImage \
   --appdir=${BUILD_DIR}/duckstation-qt.AppDir \
   --executable=${BUILD_DIR}/bin/duckstation-qt \
-  --desktop-file=${APPIMAGE_RESOURCES_DIR}/duckstation-qt.desktop \
+  --desktop-file=${APPIMAGE_RESOURCES_DIR}/linux-desktop-files/duckstation-qt.desktop \
   ${ICONS_QT[@]/#/--icon-file=} \
   --plugin=qt
 
@@ -86,6 +86,6 @@ OUTPUT="duckstation-nogui-x64.AppImage" \
 ${BUILD_DIR}/linuxdeploy-x86_64.AppImage \
   --appdir=${BUILD_DIR}/duckstation-nogui.AppDir \
   --executable=${BUILD_DIR}/bin/duckstation-nogui \
-  --desktop-file=${APPIMAGE_RESOURCES_DIR}/duckstation-nogui.desktop \
+  --desktop-file=${APPIMAGE_RESOURCES_DIR}/linux-desktop-files/duckstation-nogui.desktop \
   ${ICONS_NOGUI[@]/#/--icon-file=} \
   --output=appimage