From e3ae6b6d57ee21cffe898acfb5479073a2e1740f Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Wed, 20 Dec 2023 09:32:37 +0100
Subject: [PATCH] Fixing the mess after the merge (hopefully)

---
 .github/workflows/cooker-selfhosted.yml | 1 -
 .github/workflows/main-selfhosted.yml   | 2 +-
 README.md                               | 2 +-
 automation_tools/version_extractor.sh   | 2 +-
 net.retrodeck.retrodeck.yml             | 8 ++++----
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 857bdbae..b2dcd994 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -151,4 +151,3 @@ jobs:
           name: retrodeck-flatpak
           path: RetroDECK-cooker.flatpak
         continue-on-error: true
-
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index b30cb9aa..5bb301a2 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -125,4 +125,4 @@ jobs:
         with:
           name: retrodeck-flatpak
           path: RetroDECK.flatpak
-        continue-on-error: true
+        continue-on-error: true
\ No newline at end of file
diff --git a/README.md b/README.md
index b9e72b50..11a6f89f 100644
--- a/README.md
+++ b/README.md
@@ -92,4 +92,4 @@ Please check out the [Wiki](https://retrodeck.readthedocs.io/en/latest/) for eve
 The RetroDECK [FAQ](https://retrodeck.readthedocs.io/en/latest/wiki_howto_faq/faq/) on the wiki has a vast variety of questions and awnsers. 
 
 # How to get support? 
-Use the supports channels on [Discord](https://discord.gg/Dz3szYsP8g) `🤝-community-support` and `🆘-support`.
+Use the supports channels on [Discord](https://discord.gg/Dz3szYsP8g) `🤝-community-support` and `🆘-support`.
\ No newline at end of file
diff --git a/automation_tools/version_extractor.sh b/automation_tools/version_extractor.sh
index 4838826b..b9f679ff 100755
--- a/automation_tools/version_extractor.sh
+++ b/automation_tools/version_extractor.sh
@@ -29,6 +29,6 @@ fetch_manifest_version(){
     # Use awk to extract the value of the first iteration of VERSION variable
     manifest_version=$(echo "$manifest_content" | awk '/VERSION=/ && !/#/ { sub(/.*VERSION=/, ""); sub(/#.*/, ""); print; exit }')
     # Trim leading and trailing whitespace
-    manifest_version=$(echo "$manifest_version" | awk '{gsub(/[^0-9.a-zA-Z]/,""); print}')
+    manifest_version=$(echo "$manifest_version" | awk '{$1=$1;print}')
     echo "$manifest_version"
 }
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 36d0cbd0..4751eed8 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -34,7 +34,7 @@ finish-args:
   - --talk-name=org.freedesktop.login1.Manager
   - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
-  - --filesystem=xdg-config/gtk-3.0:ro
+  #- --filesystem=xdg-config/gtk-3.0:ro #not needed as we got --filesystem=home
   # Dolphin
   - --allow=bluetooth
   # PPSSPP
@@ -79,15 +79,15 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   #
   # UPDATE STEPS FOR MAIN:
-  # [x] Update the VERSION variable on line containing "VERSION=THISBRANCH"
-  # [x] Update the appdata.xml with the version number and notes
+  # [X] Update the VERSION variable on line containing "VERSION=THISBRANCH"
+  # [X] Update the appdata.xml with the version number and notes
   #
   - name: version-initialization
     buildsystem: simple
     build-commands:
       - |
 
-        # on main please update this with the version variable, eg: VERSI0N='0.7.5b'
+        # on main please update this with the version variable, eg: VERSION='0.7.4b'
         # on cooker will be THISBRANCH
         VERSION="0.7.5b"