From 3ed660ee351662a7870261569d81563590e32d4a Mon Sep 17 00:00:00 2001
From: xargon <xargonwan@gmail.com>
Date: Wed, 15 Jun 2022 15:43:10 +0200
Subject: [PATCH] MANIFEST: mega trim - PART2

---
 flathub-pr.sh               | 22 ++++++++++---
 net.retrodeck.retrodeck.yml | 65 +++++++++++++++----------------------
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/flathub-pr.sh b/flathub-pr.sh
index 704a4e3c..1118ec5f 100755
--- a/flathub-pr.sh
+++ b/flathub-pr.sh
@@ -7,10 +7,25 @@ cd ~/RetroDECK
 git checkout main
 git submodule init
 git submodule update
-rsync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
+# NOTE: the only linked submodules are: rd-submodules/retroarch
+# these must be included in the exclusion list as they must be redownloaded
+#sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
+
+sync -rav --progress { \
+'rd-submodules', \
+'flathub.json', \
+'LICENSE', \
+'net.retrodeck.retrodeck.appdata.xml', \
+'net.retrodeck.retrodeck.desktop', \
+'net.retrodeck.retrodeck.yml', \
+'README.md', \
+} ~/flathub/
+
 cd ~/flathub
-rm -rf shared-submodules
-rm -rf rd-submodules
+git rm -r *
+# NOTE: be careful to remove the REAL (linked) submodules only
+rm -rf shared-modules
+rm -rf rd-submodules/retroarch
 
 # rebuilding submodules
 git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
@@ -40,7 +55,6 @@ git submodule sync;
 # Now actually pull all the modules. I used to use this...
 git submodule foreach --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)';
 
-rm flathub-pr.sh
 git submodule update
 git add *
 git commit -m "Updating flathub"
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 6c14785a..0cf56cc4 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -303,47 +303,34 @@ modules:
       - type: git
         url: https://github.com/libretro/retroarch-joypad-autoconfig.git
         commit: 760b057f1865a827762a54a8a32afda2cdd9e170
-  - name: common-shaders
-    make-install-args:
-      - PREFIX=${FLATPAK_DEST}
-    sources:
-      - type: git
-        url: https://github.com/libretro/common-shaders.git
-        commit: 55e401834b732e62c34411321c4ffd82524345d4
-  - name: slang-shaders
-    make-install-args:
-      - PREFIX=${FLATPAK_DEST}
-    sources:
-      - type: git
-        url: https://github.com/libretro/slang-shaders.git
-        commit: 148c57d9747f5db124135501ac280b5ca129a83f
-  - name: glsl-shaders
-    make-install-args:
-      - PREFIX=${FLATPAK_DEST}
-    sources:
-      - type: git
-        url: https://github.com/libretro/glsl-shaders.git
-        commit: 8f6b2649489760caea8f36ec6099998854059569
-  - name: common-overlays
-    make-install-args:
-      - PREFIX=${FLATPAK_DEST}
-    sources:
-      - type: git
-        url: https://github.com/libretro/common-overlays.git
-        commit: db9744f4e58a740f0f10b04b62af347cd6f01928
-
-  # RetroArch experiment: cloning the flathub repository directly and adding its manifest as module
-
-  # - name: retroarch
-  #   buildsystem: simple
-  #   build-commands:
-  #       - echo ""
+  # - name: common-shaders
+  #   make-install-args:
+  #     - PREFIX=${FLATPAK_DEST}
   #   sources:
   #     - type: git
-  #       url: https://github.com/flathub/org.libretro.RetroArch
-  #       tag: v1.10.2
-  #   modules:
-  #     - org.libretro.RetroArch.json
+  #       url: https://github.com/libretro/common-shaders.git
+  #       commit: 55e401834b732e62c34411321c4ffd82524345d4
+  # - name: slang-shaders
+  #   make-install-args:
+  #     - PREFIX=${FLATPAK_DEST}
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/libretro/slang-shaders.git
+  #       commit: 148c57d9747f5db124135501ac280b5ca129a83f
+  # - name: glsl-shaders
+  #   make-install-args:
+  #     - PREFIX=${FLATPAK_DEST}
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/libretro/glsl-shaders.git
+  #       commit: 8f6b2649489760caea8f36ec6099998854059569
+  # - name: common-overlays
+  #   make-install-args:
+  #     - PREFIX=${FLATPAK_DEST}
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/libretro/common-overlays.git
+  #       commit: db9744f4e58a740f0f10b04b62af347cd6f01928
 
   # RetroArch - END