From 4ae670dcf82c016f402694a3fff56d511cd80ea2 Mon Sep 17 00:00:00 2001
From: Ilya <ishurumov@gmail.com>
Date: Sat, 1 Apr 2023 02:41:24 +0600
Subject: [PATCH] - Fix incorrectly generated flatpak

---
 .appveyor/Build.sh                                 | 14 +++++++-------
 .appveyor/Install.sh                               |  8 ++++----
 .../io.github.opendriver2.Redriver2.appdata.xml    |  4 ++--
 .flatpak/start.sh                                  |  2 +-
 io.github.opendriver.redriver2.yaml                |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.appveyor/Build.sh b/.appveyor/Build.sh
index 23d3fe07..56fd62d5 100755
--- a/.appveyor/Build.sh
+++ b/.appveyor/Build.sh
@@ -1,21 +1,22 @@
 #!/usr/bin/env bash
 set -ex
 
-# Creating flatpak directories
-mkdir -p "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib" "${APPVEYOR_BUILD_FOLDER}/.flatpak/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/bin"
-
+# Configure
 cd "$APPVEYOR_BUILD_FOLDER/src_rebuild"
-
 ./premake5 gmake2
-
 cd project_gmake2_linux
 
+# Build
 for config in debug_x86 release_x86 release_dev_x86
 do
     make config=$config -j$(nproc)
 done
 
-find ${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin -name 'REDRIVER2*' -exec cp -t ${APPVEYOR_BUILD_FOLDER}/.flatpak/bin {} +
+cd ${APPVEYOR_BUILD_FOLDER}
+
+# Creating flatpak directories
+mkdir -p "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib" "${APPVEYOR_BUILD_FOLDER}/.flatpak/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/bin"
+find ${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin/Release -name 'REDRIVER2*' -exec cp -t ${APPVEYOR_BUILD_FOLDER}/.flatpak/bin {} +
 
 # Copy missing libraries in the runtime
 for lib in libjpeg libopenal libsndio libbsd
@@ -24,7 +25,6 @@ do
 done
 
 cp -r "${APPVEYOR_BUILD_FOLDER}/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/"
-cd ${APPVEYOR_BUILD_FOLDER}
 
 # Editing metadatas with the current version
 export APPVEYOR_BUILD_DATE=$(date "+%Y-%m-%d")
diff --git a/.appveyor/Install.sh b/.appveyor/Install.sh
index afe2e976..7ca639f0 100755
--- a/.appveyor/Install.sh
+++ b/.appveyor/Install.sh
@@ -26,7 +26,7 @@ export XDG_DATA_DIRS="/var/lib/flatpak/exports/share:${HOME}/.local/share/flatpa
 flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
 # Adding Platform/SDK for the Linux flatpak release
-flatpak --user install flathub org.freedesktop.Platform/x86_64/20.08 -y
-flatpak --user install flathub org.freedesktop.Sdk/x86_64/20.08 -y
-flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/20.08 -y
-flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/20.08 -y
+flatpak --user install flathub org.freedesktop.Platform/x86_64/22.08 -y
+flatpak --user install flathub org.freedesktop.Sdk/x86_64/22.08 -y
+flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/22.08 -y
+flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/22.08 -y
diff --git a/.flatpak/io.github.opendriver2.Redriver2.appdata.xml b/.flatpak/io.github.opendriver2.Redriver2.appdata.xml
index 52950d8f..c08e84b9 100644
--- a/.flatpak/io.github.opendriver2.Redriver2.appdata.xml
+++ b/.flatpak/io.github.opendriver2.Redriver2.appdata.xml
@@ -4,9 +4,9 @@
   <metadata_license>MIT</metadata_license>
   <project_license>MIT</project_license>
   <name>REDRIVER2</name>
-  <summary>Driver 2 Playstation game reverse engineering effort</summary>
+  <summary>Driver 2 - Back On The Streets / The Wheelman Is Back</summary>
   <description>
-    <p>Driver 2 Playstation game reverse engineering effort </p>
+    <p>Reverse-Engineered version of Driver 2. https://opendriver2.github.io</p>
   </description>
   <categories>
     <category>Game</category>
diff --git a/.flatpak/start.sh b/.flatpak/start.sh
index d268502f..7d0019d4 100644
--- a/.flatpak/start.sh
+++ b/.flatpak/start.sh
@@ -13,7 +13,7 @@ function importDefaultData {
 }
 
 if [ ! -d /var/data/DRIVER2 ]; then
-	zenity --error --no-wrap --text="`printf "DRIVER2 files are missing! Add the folder in:\n ${HOME}/.var/io.github.opendriver2.Redriver2/data"`"
+	zenity --error --no-wrap --text="`printf "DRIVER2 files are missing! Please provide DRIVER2 folder in:\n ${HOME}/.var/app/io.github.opendriver2.Redriver2/data"`"
 	exit 0
 fi
 
diff --git a/io.github.opendriver.redriver2.yaml b/io.github.opendriver.redriver2.yaml
index 2fa0acf1..97052a7e 100644
--- a/io.github.opendriver.redriver2.yaml
+++ b/io.github.opendriver.redriver2.yaml
@@ -1,7 +1,7 @@
 ---
 app-id: io.github.opendriver2.Redriver2
 runtime: org.freedesktop.Platform
-runtime-version: '20.08'
+runtime-version: '22.08'
 rename-icon: 'icon'
 sdk: org.freedesktop.Sdk
 command: start.sh
@@ -17,14 +17,14 @@ finish-args:
 add-extensions:
   org.freedesktop.Platform.Compat.i386:
     directory: lib/i386-linux-gnu
-    version: '20.08'
+    version: '22.08'
   org.freedesktop.Platform.Compat.i386.Debug:
     directory: lib/debug/lib/i386-linux-gnu
-    version: '20.08'
+    version: '22.08'
     no-autodownload: true
   org.freedesktop.Platform.GL32:
     directory: lib/i386-linux-gnu/GL
-    version: '20.08'
+    version: '22.08'
     subdirectories: true
     no-autodownload: true
     autodelete: false