Revert "Z plays with the scripts and GPG some more"
This reverts commit 834b29c2dc
.
This commit is contained in:
parent
d07eac31bc
commit
9de6a01c18
2 changed files with 12 additions and 27 deletions
|
@ -22,23 +22,13 @@ function applyPatch {
|
|||
git clone "$what" "$target"
|
||||
fi
|
||||
cd "$basedir/$target"
|
||||
|
||||
# Disable GPG signing before AM, slows things down and doesn't play nicely.
|
||||
# There is also zero rational or logical reason to do so for these sub-repo AMs.
|
||||
# Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.
|
||||
if [[ "$gpgsign" == "true" ]]; then
|
||||
git config commit.gpgsign false
|
||||
fi
|
||||
|
||||
echo "Resetting $target to $what_name..."
|
||||
git remote rm upstream > /dev/null 2>&1
|
||||
git remote add upstream "$basedir/$what" >/dev/null 2>&1
|
||||
git checkout master 2>/dev/null || git checkout -b master
|
||||
git fetch upstream >/dev/null 2>&1
|
||||
git reset --hard upstream/upstream
|
||||
|
||||
echo " Applying patches to $target..."
|
||||
|
||||
git am --abort >/dev/null 2>&1
|
||||
git am --3way --ignore-whitespace "$basedir/${what_name}-Patches/"*.patch
|
||||
if [ "$?" != "0" ]; then
|
||||
|
@ -53,10 +43,18 @@ function applyPatch {
|
|||
|
||||
function enableCommitSigningIfNeeded {
|
||||
if [[ "$gpgsign" == "true" ]]; then
|
||||
git config commit.gpgsign true
|
||||
git config --global commit.gpgsign true
|
||||
fi
|
||||
}
|
||||
|
||||
# Disable GPG signing before AM, slows things down and doesn't play nicely.
|
||||
# There is also zero rational or logical reason to do so for these sub-repo AMs.
|
||||
# Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.
|
||||
if [[ "$gpgsign" == "true" ]]; then
|
||||
# Yes, this has to be global
|
||||
git config --global commit.gpgsign false
|
||||
fi
|
||||
|
||||
# Move into spigot dir
|
||||
cd "$workdir/Spigot"
|
||||
basedir=$(pwd)
|
||||
|
|
|
@ -9,19 +9,12 @@ minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion |
|
|||
decompiledir="$workdir/$minecraftversion"
|
||||
nms="$decompiledir/net/minecraft/server"
|
||||
cb="src/main/java/net/minecraft/server"
|
||||
gpgsign=$(git config commit.gpgsign)
|
||||
|
||||
patch=$(which patch 2>/dev/null)
|
||||
if [ "x$patch" == "x" ]; then
|
||||
patch="$basedir/hctap.exe"
|
||||
fi
|
||||
|
||||
function enableCommitSigningIfNeeded {
|
||||
if [[ "$gpgsign" == "true" ]]; then
|
||||
git config commit.gpgsign true
|
||||
fi
|
||||
}
|
||||
|
||||
echo "Applying CraftBukkit patches to NMS..."
|
||||
cd "$workdir/CraftBukkit"
|
||||
git checkout -B patched HEAD >/dev/null 2>&1
|
||||
|
@ -42,12 +35,6 @@ do
|
|||
done
|
||||
|
||||
git add src >/dev/null 2>&1
|
||||
# We don't need to sign an automated commit
|
||||
# All it does is make you input your key passphrase mid-patch
|
||||
if [[ "$gpgsign" == "true" ]]; then
|
||||
git config commit.gpgsign false
|
||||
fi
|
||||
git commit -m "CraftBukkit $ $(date)" >/dev/null 2>&1
|
||||
enableCommitSigningIfNeeded
|
||||
git checkout -f HEAD^ >/dev/null 2>&1
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue