Limework/LimeLogin
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed some useless stuff

Browse Source
This commit is contained in:
mohammed jasem alaajel 2021-06-15 00:51:29 +04:00
parent ddccc3a36a
commit 887c730aa9
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applyPatches.sh
View File

@ -17,11 +17,6 @@ applyPatch() {
cd "$basedir/$target" cd "$basedir/$target"
echo "Resetting $target to $what..." echo "Resetting $target to $what..."
git config commit.gpgSign false git config commit.gpgSign false
git remote rm origin >/dev/null 2>&1
git remote add origin $what >/dev/null 2>&1
git checkout master >/dev/null 2>&1
git fetch origin >/dev/null 2>&1
git reset --hard $branch
echo " Applying patches to $target..." echo " Applying patches to $target..."
git am --abort >/dev/null 2>&1 git am --abort >/dev/null 2>&1
git am --3way "../${pfoldername}-Patches/"*.patch git am --3way "../${pfoldername}-Patches/"*.patch
@ -36,8 +31,5 @@ applyPatch() {
} }
git submodule update --init git submodule update --init
cd FastLogin
hash=$(git rev-parse HEAD)
git branch -f main "$hash"
applyPatch LimeLogin FastLogin LimeLogin-Plugin main applyPatch LimeLogin FastLogin LimeLogin-Plugin main