Updated to 0.4.3b from flathub

This commit is contained in:
xargon 2022-07-06 20:00:47 +02:00
parent 9d7078ef89
commit 62cab401f2
3 changed files with 12 additions and 71 deletions

2
.gitignore vendored
View file

@ -13,3 +13,5 @@ Thumbs.db
.flatpak-builder/
retrodeck-flatpak-cooker/
retrodeck-flatpak/
bakcup
.old

View file

@ -1,71 +0,0 @@
#!/bin/bash
cd ~
rm -rf flathub
git clone --branch=RetroDECK --recursive https://github.com/XargonWan/flathub.git
cd ~/RetroDECK
git checkout main
git submodule init
git submodule update
# 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/
cd ~/flathub
git rm -rf *
git clean -fxd # restroing git index
cd ~/RetroDECK
cp -rf \
'rd-submodules' \
'flathub.json' \
'LICENSE' \
'net.retrodeck.retrodeck.appdata.xml' \
'net.retrodeck.retrodeck.desktop' \
'net.retrodeck.retrodeck.yml' \
'README.md' \
~/flathub/
cd ~/flathub
# #rebuilding submodules
# git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
# while read path_key path
# do
# url_key=$(echo $path_key | sed 's/\.path/.url/');
# branch_key=$(echo $path_key | sed 's/\.path/.branch/');
# # If the url_key doesn't yet exist then backup up the existing
# # directory if necessary and add the submodule
# if [ ! $(git config --get "$url_key") ]; then
# if [ -d "$path" ] && [ ! $(git config --get "$url_key") ]; then
# mv "$path" "$path""_backup_""$(date +'%Y%m%d%H%M%S')";
# fi;
# url=$(git config -f .gitmodules --get "$url_key");
# # If a branch is specified then use that one, otherwise
# # default to master
# branch=$(git config -f .gitmodules --get "$branch_key");
# if [ ! "$branch" ]; then branch="master"; fi;
# git submodule add -f -b "$branch" "$url" "$path";
# fi;
# done;
# # In case the submodule exists in .git/config but the url is out of date
# 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 -rf .git/modules/*
# Adding the real submodules, please update this every time a submodule is added
git rm -rf shared-modules
git submodule add https://github.com/flathub/shared-modules.git shared-modules
git rm -rf rd-submodules/retroarch
git submodule add https://github.com/flathub/org.libretro.RetroArch.git rd-submodules/retroarch
# unbinds all submodules
git submodule deinit -f .
# checkout again
git submodule update --init --recursive
git add *
git commit -m "Updating flathub"
git push origin RetroDECK

10
flathub-pull.sh Executable file
View file

@ -0,0 +1,10 @@
#!/bin/bash
mkdir backup
mv net.retrodeck.retrodeck.yml backup
mv net.retrodeck.retrodeck.appdata.xml backup
wget https://raw.githubusercontent.com/flathub/net.retrodeck.retrodeck/master/net.retrodeck.retrodeck.yml
wget https://raw.githubusercontent.com/flathub/net.retrodeck.retrodeck/master/net.retrodeck.retrodeck.appdata.xml
git add net.retrodeck.retrodeck.yml
git add net.retrodeck.retrodeck.appdata.xml
git commit -m "Pulled from flathub"