From 43ef3142884834c985795d81cd19af3e0f70dc0e 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?= Date: Mon, 13 Apr 2020 10:33:12 +0800 Subject: [PATCH] move gitcmd to script/functions.sh --- patches/api/0001-POM-Changes.patch | 2 +- patches/api/0002-Server-Config.patch | 2 +- patches/server/0001-POM-Changes.patch | 2 +- patches/server/0002-Brand-changes.patch | 2 +- .../0003-Avoid-double-I-O-operation-on-load-player-file.patch | 2 +- ...4-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch | 2 +- patches/server/0005-never-drop-items-on-command-give.patch | 2 +- patches/server/0006-Save-json-list-async.patch | 2 +- patches/server/0007-Remove-method-profiler-callers.patch | 2 +- patches/server/0008-Disable-Snooper.patch | 2 +- patches/server/0009-Server-Config.patch | 2 +- patches/server/0010-Async-pathfinder.patch | 2 +- patches/server/0011-Optimizations-for-network.patch | 2 +- .../server/0012-Swaps-the-predicate-order-of-collision.patch | 2 +- scripts/functions.sh | 2 +- scripts/rebuildPatches.sh | 2 -- 16 files changed, 15 insertions(+), 17 deletions(-) diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index cf1c5f76b..bcb0d04b3 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 0ecc29211d18fdc5025aa7d359cb5c9f2f879e72 Mon Sep 17 00:00:00 2001 +From 451f860923d6872474dd97f2b29d4fa389eef617 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?= Date: Fri, 14 Dec 2018 21:52:29 -0800 diff --git a/patches/api/0002-Server-Config.patch b/patches/api/0002-Server-Config.patch index 8623e8977..cb283ed2c 100644 --- a/patches/api/0002-Server-Config.patch +++ b/patches/api/0002-Server-Config.patch @@ -1,4 +1,4 @@ -From fa3dd80af1219598e0e39e0bd5fabf615ddab05a Mon Sep 17 00:00:00 2001 +From 826f2acc2c1b671364e785e9a711319124195b83 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?= Date: Fri, 3 Apr 2020 15:18:38 +0800 diff --git a/patches/server/0001-POM-Changes.patch b/patches/server/0001-POM-Changes.patch index ece4758a9..5ae28bce2 100644 --- a/patches/server/0001-POM-Changes.patch +++ b/patches/server/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 06a8a154ce4adc68135ae3b1f51060b06a268e23 Mon Sep 17 00:00:00 2001 +From 49f54efc6cbccbab4cfc22092a8f082bedad0680 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?= Date: Fri, 14 Dec 2018 21:53:58 -0800 diff --git a/patches/server/0002-Brand-changes.patch b/patches/server/0002-Brand-changes.patch index c5d349b49..63d659fad 100644 --- a/patches/server/0002-Brand-changes.patch +++ b/patches/server/0002-Brand-changes.patch @@ -1,4 +1,4 @@ -From 71c51dcb476fe96b478738a18fcc4dca8fcf9393 Mon Sep 17 00:00:00 2001 +From 8afa07bbddc4de731f0c1cc16fcc2bda4a0f1a6b 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?= Date: Tue, 18 Dec 2018 06:27:02 -0800 diff --git 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 index b5fac040d..8c469b40d 100644 --- 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,4 +1,4 @@ -From 237a9483df7e42b884720cd3d8882c576018bf3d Mon Sep 17 00:00:00 2001 +From 97bf7cdb61acb7fb8d779cfa2ba180dc68f885db 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?= Date: Thu, 2 Apr 2020 11:29:08 +0800 diff --git 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 index 231ea453e..752541034 100644 --- 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,4 +1,4 @@ -From 36bbc67b32ef6030dcf4e76c72da098a00e7ded4 Mon Sep 17 00:00:00 2001 +From eb9755b2826b684d490cbf8911f639588748a3de 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?= Date: Thu, 2 Apr 2020 11:43:20 +0800 diff --git a/patches/server/0005-never-drop-items-on-command-give.patch b/patches/server/0005-never-drop-items-on-command-give.patch index cf32444b7..3ac8905f9 100644 --- a/patches/server/0005-never-drop-items-on-command-give.patch +++ b/patches/server/0005-never-drop-items-on-command-give.patch @@ -1,4 +1,4 @@ -From 3e02c4d2280b899d65886322e2b9cdfbe5b339ee Mon Sep 17 00:00:00 2001 +From 1a401b7748c3ca37ecf2c464888809e2ef01cf03 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?= Date: Thu, 2 Apr 2020 11:35:19 +0800 diff --git a/patches/server/0006-Save-json-list-async.patch b/patches/server/0006-Save-json-list-async.patch index 91f9fd511..14ab92e24 100644 --- a/patches/server/0006-Save-json-list-async.patch +++ b/patches/server/0006-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From b1aa7c934ecf3c1f516e4dd372331689ae7952b7 Mon Sep 17 00:00:00 2001 +From e0718d6b2b64b8f95fa452f7cb06faebdb74817d 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?= Date: Thu, 2 Apr 2020 11:16:18 +0800 diff --git a/patches/server/0007-Remove-method-profiler-callers.patch b/patches/server/0007-Remove-method-profiler-callers.patch index e28e18a24..a0e7a9062 100644 --- a/patches/server/0007-Remove-method-profiler-callers.patch +++ b/patches/server/0007-Remove-method-profiler-callers.patch @@ -1,4 +1,4 @@ -From 3ac2c508e2549da0df909ac67db4a966eb3a375a Mon Sep 17 00:00:00 2001 +From 3950f8c78c334400409f232141e16e1489668e3b 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?= Date: Thu, 2 Apr 2020 12:30:35 +0800 diff --git a/patches/server/0008-Disable-Snooper.patch b/patches/server/0008-Disable-Snooper.patch index 0be87693b..301f36bad 100644 --- a/patches/server/0008-Disable-Snooper.patch +++ b/patches/server/0008-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From ffaa96824f33cc0827c0db63b3c26d76e573548a Mon Sep 17 00:00:00 2001 +From fc11d046a4c647b8a937de6ee3fce8c62716d44c 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?= Date: Thu, 2 Apr 2020 14:03:29 +0800 diff --git a/patches/server/0009-Server-Config.patch b/patches/server/0009-Server-Config.patch index 5242e79ad..fb214464f 100644 --- a/patches/server/0009-Server-Config.patch +++ b/patches/server/0009-Server-Config.patch @@ -1,4 +1,4 @@ -From 37e665c4b756f6f9d6c50dce34065dce82e70edd Mon Sep 17 00:00:00 2001 +From ce97ab1fd6c780af9349a412ce08a3be11b5ade5 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?= Date: Fri, 3 Apr 2020 14:59:22 +0800 diff --git a/patches/server/0010-Async-pathfinder.patch b/patches/server/0010-Async-pathfinder.patch index 0695ea4e0..170e8f02a 100644 --- a/patches/server/0010-Async-pathfinder.patch +++ b/patches/server/0010-Async-pathfinder.patch @@ -1,4 +1,4 @@ -From 0d3e3bd5b41013bf59fc97f0327536cd3a0cc44b Mon Sep 17 00:00:00 2001 +From c9418782de5dd5c3029b77266768d8462ee33c91 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?= Date: Sun, 5 Apr 2020 13:01:13 +0800 diff --git a/patches/server/0011-Optimizations-for-network.patch b/patches/server/0011-Optimizations-for-network.patch index 3de2fc990..e5863305c 100644 --- a/patches/server/0011-Optimizations-for-network.patch +++ b/patches/server/0011-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From 02c47a67a956da42ac10039ad3c34aa2603aacbe Mon Sep 17 00:00:00 2001 +From 5cadee0902dc175d79e6a94bd1027d5232494562 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?= Date: Sun, 5 Apr 2020 14:59:10 +0800 diff --git a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch index a0e908812..72310785e 100644 --- a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch @@ -1,4 +1,4 @@ -From d1e9e0c8efc7fd030083b4a3d5f47fed38c991f0 Mon Sep 17 00:00:00 2001 +From 160f809971571a322f29f135a6a7b1939d774260 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?= Date: Fri, 10 Apr 2020 15:47:15 +0800 diff --git a/scripts/functions.sh b/scripts/functions.sh index bffedb798..4396846c9 100755 --- 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 -c core.quotepath=false" +gitcmd="git -c commit.gpgsign=false -c core.quotepath=false -c core.safecrlf=false -c i18n.commit.encoding=UTF-8 -c i18n.logoutputencoding=UTF-8" # DIR configure # resolve shell-specifics diff --git a/scripts/rebuildPatches.sh b/scripts/rebuildPatches.sh index 84748bdc0..9c6dd5cc3 100755 --- a/scripts/rebuildPatches.sh +++ b/scripts/rebuildPatches.sh @@ -13,8 +13,6 @@ echo " - $(bashcolor 1 32)2$(bashcolorend) : Server" echo "----------------------------------------" # SCRIPT HEADER end -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 basedir