remove "git config commit.gpgsign" since it's included in $gitcmd; set encoding to UTF-8; correct scripts file name

2020-04-13 10:27:02 +08:00
parent aff7715bff
commit 8ea17d256c
21 changed files with 48 additions and 66 deletions
--- a/patches/api/0001-POM-Changes.patch
+++ b/patches/api/0001-POM-Changes.patch
@@ -1,5 +1,5 @@
-From 7c3f22c070e5d9027dace7cf295292444472579f Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 0ecc29211d18fdc5025aa7d359cb5c9f2f879e72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:52:29 -0800
 Subject: [PATCH] POM Changes
@@ -35,5 +35,5 @@ index 2cb97140..d167304b 100644
 
     <properties>
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/api/0002-Server-Config.patch
+++ b/patches/api/0002-Server-Config.patch
@@ -1,5 +1,5 @@
-From 5d805daa7d4b42c7700a065a98678a0d58b80947 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From fa3dd80af1219598e0e39e0bd5fabf615ddab05a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 15:18:38 +0800
 Subject: [PATCH] Server Config
@@ -39,5 +39,5 @@ index 9ceaac0e..7444b415 100644
          * Sends the component to the player
          *
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0001-POM-Changes.patch
+++ b/patches/server/0001-POM-Changes.patch
@@ -1,5 +1,5 @@
-From e9f7cd8c44e8e9fa8fa6091cfc231f0a2425737f Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 06a8a154ce4adc68135ae3b1f51060b06a268e23 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:53:58 -0800
 Subject: [PATCH] POM Changes
@@ -80,5 +80,5 @@ index 674096cab..9a7235b8e 100644
 
         if (stream != null) {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0002-Brand-changes.patch
+++ b/patches/server/0002-Brand-changes.patch
@@ -1,5 +1,5 @@
-From 075ad41da85158264b2df37852138991654cb26e Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 71c51dcb476fe96b478738a18fcc4dca8fcf9393 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Tue, 18 Dec 2018 06:27:02 -0800
 Subject: [PATCH] Brand changes
@@ -45,5 +45,5 @@ index 8cc0f66ce..b381514d9 100644
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
+++ b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch
@@ -1,5 +1,5 @@
-From 77658832062252611968bfd27ff297f938b3e851 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 237a9483df7e42b884720cd3d8882c576018bf3d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:29:08 +0800
 Subject: [PATCH] Avoid double I/O operation on load player file
@@ -29,5 +29,5 @@ index 350ac42d6..65cc7b205 100644
             }
             // Spigot Start
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
+++ b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
@@ -1,5 +1,5 @@
-From 996bc6f14593ca3bf46438e00027064d799a9eb9 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 36bbc67b32ef6030dcf4e76c72da098a00e7ded4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:43:20 +0800
 Subject: [PATCH] Don't trigger Lootable Refresh for non player interaction
@@ -18,5 +18,5 @@ index d4cbce324..0ff6ebbf9 100644
             LootTable loottable = this.world.getMinecraftServer().getLootTableRegistry().getLootTable(this.lootTable);
 
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0005-never-drop-items-on-command-give.patch
+++ b/patches/server/0005-never-drop-items-on-command-give.patch
@@ -1,5 +1,5 @@
-From a2a2cbe3ed2d3397e61c0e335ddd019834f8c1ec Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 3e02c4d2280b899d65886322e2b9cdfbe5b339ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:35:19 +0800
 Subject: [PATCH] never drop items on command "/give"
@@ -18,5 +18,5 @@ index 81b26bb4d..1f3097c94 100644
                     itemstack.setCount(1);
                     entityitem = entityplayer.drop(itemstack, false);
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0006-Save-json-list-async.patch
+++ b/patches/server/0006-Save-json-list-async.patch
@@ -1,5 +1,5 @@
-From dd729a9d2c43e67dc5481fadb05c0328426c66d1 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From b1aa7c934ecf3c1f516e4dd372331689ae7952b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:16:18 +0800
 Subject: [PATCH] Save json list async
@@ -33,5 +33,5 @@ index c97be42dd..370841cad 100644
 
     public void load() throws FileNotFoundException {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0007-Remove-method-profiler-callers.patch
+++ b/patches/server/0007-Remove-method-profiler-callers.patch
@@ -1,5 +1,5 @@
-From 3ba075eaca355647259518afff4ffa3e9425d385 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 3ac2c508e2549da0df909ac67db4a966eb3a375a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 12:30:35 +0800
 Subject: [PATCH] Remove method profiler callers
@@ -781,5 +781,5 @@ index 84a3367b8..2da0cb6c9 100644
 
     @Override
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0008-Disable-Snooper.patch
+++ b/patches/server/0008-Disable-Snooper.patch
@@ -1,5 +1,5 @@
-From e170e06ca265bf64491b3962bc333c636db669a1 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From ffaa96824f33cc0827c0db63b3c26d76e573548a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 14:03:29 +0800
 Subject: [PATCH] Disable Snooper
@@ -27,5 +27,5 @@ index 36e11bb25..4740e6e18 100644
         //this.methodProfiler.exit(); // Akarin - remove caller
         //this.methodProfiler.enter("tallying"); // Akarin - remove caller
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0009-Server-Config.patch
+++ b/patches/server/0009-Server-Config.patch
@@ -1,5 +1,5 @@
-From 1ff9ceb7164fc8d7536e02540db20136d8eb2f27 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 37e665c4b756f6f9d6c50dce34065dce82e70edd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 14:59:22 +0800
 Subject: [PATCH] Server Config
@@ -282,5 +282,5 @@ index cb60310e6..04694464b 100644
                 acceptsAll(asList("server-name"), "Name of the server")
                         .withRequiredArg()
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0010-Async-pathfinder.patch
+++ b/patches/server/0010-Async-pathfinder.patch
@@ -1,5 +1,5 @@
-From 8620d79bc05a58236de15884c5d8d06443b6ccf3 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 0d3e3bd5b41013bf59fc97f0327536cd3a0cc44b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 13:01:13 +0800
 Subject: [PATCH] Async pathfinder
@@ -341,5 +341,5 @@ index 075b63ef5..a3473ddcf 100644
 
         if (f >= 0.0F) {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0011-Optimizations-for-network.patch
+++ b/patches/server/0011-Optimizations-for-network.patch
@@ -1,5 +1,5 @@
-From 8a2e2f2278a88e99a1f122d096bb9737e71c3a2c Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From 02c47a67a956da42ac10039ad3c34aa2603aacbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 14:59:10 +0800
 Subject: [PATCH] Optimizations for network
@@ -404,5 +404,5 @@ index 6d6fbf2f5..4b549ccc4 100644
         entityplayer.getStatisticManager().c();
         entityplayer.B().a(entityplayer);
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch
+++ b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch
@@ -1,5 +1,5 @@
-From 97a1a0c47a5d5ea34d3307c7f0104947f666f2c0 Mon Sep 17 00:00:00 2001
-From: =?GB2312?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
+From d1e9e0c8efc7fd030083b4a3d5f47fed38c991f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 10 Apr 2020 15:47:15 +0800
 Subject: [PATCH] Swaps the predicate order of collision
@@ -77,5 +77,5 @@ index 147c5288a..6cf3eb12b 100644
     }
 
 -- 
-2.25.1.windows.1
+2.20.1

--- a/scripts/applyPatches.sh
+++ b/scripts/applyPatches.sh
@@ -17,7 +17,6 @@ echo "----------------------------------------"
 # SCRIPT HEADER end

 needimport=$2
-gpgsign="$(git config commit.gpgsign || echo "false")"

 function applyPatch {
    baseproject=$1
@@ -56,11 +55,6 @@ function applyPatch {
    cd "$basedir/$target"
 	$gitcmd init > /dev/null 2>&1

-    # 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.
-    $gitcmd config commit.gpgsign false
-
 	echo "  $(bashcolor 1 32)($5/$6)$(bashcolorend) - Reset $target to $basename.."
 	# Add the generated Paper project as the upstream remote of subproject
    $gitcmd remote rm upstream >/dev/null 2>&1
@@ -92,17 +86,5 @@ function applyPatch {
    fi
 }

-function enableCommitSigningIfNeeded {
-    if [[ "$gpgsign" == "true" ]]; then
-        git config commit.gpgsign true
-    fi
-}
-
-(
 (applyPatch Paper/Paper-API ${FORK_NAME}-API HEAD api $API_REPO 0 2 &&
 applyPatch Paper/Paper-Server ${FORK_NAME}-Server HEAD server $SERVER_REPO 1 2) || exit 1
-    enableCommitSigningIfNeeded
-) || (
-    enableCommitSigningIfNeeded
-    exit 1
-) || exit 1
--- a/scripts/commitUpstream.sh
+++ b/scripts/commitUpstream.sh
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -7,7 +7,7 @@ PAPER_API_REPO=""
 PAPER_SERVER_REPO=""
 MCDEV_REPO=""

-gitcmd="git -c commit.gpgsign=false"
+gitcmd="git -c commit.gpgsign=false -c core.quotepath=false"

 # DIR configure
 # resolve shell-specifics
--- a/scripts/importSources.sh
+++ b/scripts/importSources.sh
--- a/scripts/installLauncher.sh
+++ b/scripts/installLauncher.sh
--- a/scripts/rebuildPatches.sh
+++ b/scripts/rebuildPatches.sh
@@ -13,7 +13,7 @@ echo "  - $(bashcolor 1 32)2$(bashcolorend) : Server"
 echo "----------------------------------------"
 # SCRIPT HEADER end

-gitcmd="git -c commit.gpgsign=false -c core.safecrlf=false"
+gitcmd="git -c commit.gpgsign=false -c core.safecrlf=false -c i18n.commit.encoding=UTF-8 -c i18n.logoutputencoding=UTF-8"

 function savePatches {
    targetname=$1
--- a/scripts/updateUpstream.sh
+++ b/scripts/updateUpstream.sh