From faa218f4ddd8ecdfc2712f0247883e5b2d2d9a5b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 13 Mar 2023 17:34:56 +0000 Subject: [PATCH] Updated submodules --- .gitmodules | 2 +- force-update-submodules.sh | 15 +++++++++++++++ rd-submodules/retroarch | 2 +- update-submodules.sh | 3 --- 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 force-update-submodules.sh delete mode 100644 update-submodules.sh diff --git a/.gitmodules b/.gitmodules index 9d6f4fb6..79067fd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/flathub/shared-modules.git [submodule "rd-submodules/retroarch"] path = rd-submodules/retroarch - url = https://github.com/flathub/org.libretro.RetroArch.git + url = https://github.com/flathub/org.libretro.RetroArch diff --git a/force-update-submodules.sh b/force-update-submodules.sh new file mode 100644 index 00000000..57d3df5f --- /dev/null +++ b/force-update-submodules.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +git submodule deinit --all +rm rd-submodules/retroarch +git rm -rf --cached rd-submodules/retroarch +rm -rf .git/modules/rd-submodules/retroarch +rm -rf shared-modules +git rm -rf --cached shared-modules +rm -rf .git/modules/shared-modules + +git submodule init +git submodule add https://github.com/flathub/shared-modules.git +git submodule add https://github.com/flathub/org.libretro.RetroArch rd-submodules/retroarch + +git submodule update --remote --merge --recursive \ No newline at end of file diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 882bd49b..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 882bd49bfa2fa09e79fc7685a60c65e1b8e2d0f9 +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/update-submodules.sh b/update-submodules.sh deleted file mode 100644 index 409637fc..00000000 --- a/update-submodules.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -git submodule update --remote --merge --recursive \ No newline at end of file