mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Handle gpg signing better (#1123)

Browse source 
Instead of checking whether it was set previously, setting it to false,
then setting it back to true if it was true before, just use the
command-line argument in git to override the config for that command.
Using a variable makes it pretty painless to do.
This commit is contained in:
Kyle Wood 2018-05-24 13:41:50 -05:00 • committed by Zach
parent 3eb1cdef72
commit d45565f83b
10 changed files with 87 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/apatch.sh
View file

@ -1,4 +1,7 @@
#!/bin/bash
gitcmd="git -c commit.gpgsign=false"
noapply=1
isreject=0
if [[ $1 == "--noapplied" ]]; then
@ -18,18 +21,18 @@ else
fi
applied=$(echo $file | sed 's/.patch$/-applied\.patch/g')
if [ "$1" == "--reset" ]; then
git am --abort
git reset --hard
git clean -f
$gitcmd am --abort
$gitcmd reset --hard
$gitcmd clean -f
exit 0
fi
(test "$isreject" != "1" && git am -3 $file) || (
(test "$isreject" != "1" && $gitcmd am -3 $file) || (
echo "Failures - Wiggling"
git reset --hard
git clean -f
errors=$(git apply --rej $file 2>&1)
$gitcmd reset --hard
$gitcmd clean -f
errors=$($gitcmd apply --rej $file 2>&1)
echo "$errors" >> ~/patch.log
export missingfiles=""
export summaryfail=""
@ -44,12 +47,12 @@ fi
missingfiles="$missingfiles\n$base"
fi
done
for i in $(git status --porcelain | awk '{print $2}'); do
for i in $($gitcmd status --porcelain | awk '{print $2}'); do
filedata=$(cat "$i")
if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
else
git add "$i"
$gitcmd add "$i"
export summarygood="$summarygood\nAPPLIED CLEAN: $i"
fi
done
@ -64,8 +67,8 @@ fi
echo " "
echo "===========================";
fi
git status
git diff
$gitcmd status
$gitcmd diff
)
if [[ "$noapply" != "1" ]] && [[ "$file" != *-applied.patch ]]; then
mv "$file" "$applied"