From 2cf6e8f5c964f3bc4455434c4c45349187a50f43 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 6 Jul 2021 19:43:28 +1000 Subject: [PATCH] Move dist files into extras --- dist/org.duckstation.DuckStation.metainfo.xml | 33 ------------------ {dist => extras/icons}/icon-128px.png | Bin {dist => extras/icons}/icon-16px.png | Bin {dist => extras/icons}/icon-256px.png | Bin {dist => extras/icons}/icon-32px.png | Bin {dist => extras/icons}/icon-48px.png | Bin {dist => extras/icons}/icon-64px.png | Bin .../duckstation-nogui.desktop | 0 .../duckstation-qt.desktop | 0 scripts/generate_appimages.sh | 12 +++---- 10 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 dist/org.duckstation.DuckStation.metainfo.xml rename {dist => extras/icons}/icon-128px.png (100%) rename {dist => extras/icons}/icon-16px.png (100%) rename {dist => extras/icons}/icon-256px.png (100%) rename {dist => extras/icons}/icon-32px.png (100%) rename {dist => extras/icons}/icon-48px.png (100%) rename {dist => extras/icons}/icon-64px.png (100%) rename {dist => extras/linux-desktop-files}/duckstation-nogui.desktop (100%) rename {dist => extras/linux-desktop-files}/duckstation-qt.desktop (100%) diff --git a/dist/org.duckstation.DuckStation.metainfo.xml b/dist/org.duckstation.DuckStation.metainfo.xml deleted file mode 100644 index c94ee92b7..000000000 --- a/dist/org.duckstation.DuckStation.metainfo.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - org.duckstation.DuckStation - org.duckstation.DuckStation.desktop - CC0-1.0 - GPL-3.0 - DuckStation - PlayStation 1/PSX emulator. - -

- 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. -

- - - https://github.com/stenzek/duckstation/raw/md-images/bigduck.png - https://github.com/stenzek/duckstation/raw/md-images/main.png - https://github.com/stenzek/duckstation/raw/md-images/gamegrid.png - https://github.com/stenzek/duckstation/raw/md-images/tof.jpg - - - Games - Emulator - - https://duckstation.org/ - https://github.com/stenzek/duckstation/issues - https://www.duckstation.org/wiki/Main_Page - Connor McLaughlin - - - - - diff --git a/dist/icon-128px.png b/extras/icons/icon-128px.png similarity index 100% rename from dist/icon-128px.png rename to extras/icons/icon-128px.png diff --git a/dist/icon-16px.png b/extras/icons/icon-16px.png similarity index 100% rename from dist/icon-16px.png rename to extras/icons/icon-16px.png diff --git a/dist/icon-256px.png b/extras/icons/icon-256px.png similarity index 100% rename from dist/icon-256px.png rename to extras/icons/icon-256px.png diff --git a/dist/icon-32px.png b/extras/icons/icon-32px.png similarity index 100% rename from dist/icon-32px.png rename to extras/icons/icon-32px.png diff --git a/dist/icon-48px.png b/extras/icons/icon-48px.png similarity index 100% rename from dist/icon-48px.png rename to extras/icons/icon-48px.png diff --git a/dist/icon-64px.png b/extras/icons/icon-64px.png similarity index 100% rename from dist/icon-64px.png rename to extras/icons/icon-64px.png diff --git a/dist/duckstation-nogui.desktop b/extras/linux-desktop-files/duckstation-nogui.desktop similarity index 100% rename from dist/duckstation-nogui.desktop rename to extras/linux-desktop-files/duckstation-nogui.desktop diff --git a/dist/duckstation-qt.desktop b/extras/linux-desktop-files/duckstation-qt.desktop similarity index 100% rename from dist/duckstation-qt.desktop rename to extras/linux-desktop-files/duckstation-qt.desktop diff --git a/scripts/generate_appimages.sh b/scripts/generate_appimages.sh index f2d807c04..3008ca5f7 100755 --- a/scripts/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))/../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 - [[ ${filename} =~ ${APPIMAGE_RESOURCES_DIR}/icon-(.*)px.png ]]; +for filename in ${APPIMAGE_RESOURCES_DIR}/icons/icon-*px.png; do + [[ ${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