From 2a2e9149ec139b26d53e8712171b1a2aa70aaaec 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: Sat, 2 May 2020 10:59:20 +0800
Subject: [PATCH] update maven flags

---
 akarin                    | 14 +++++++-------
 scripts/functions.sh      |  2 +-
 scripts/updateUpstream.sh |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/akarin b/akarin
index a83d38e30..ee9473b19 100755
--- a/akarin
+++ b/akarin
@@ -6,7 +6,7 @@
 # Multicore building                                                       #
 # By JosephWorks                                                           #
 # -------------------------------------------------------------------------#
-# To use multicore building, add "-T ${BUILD_CORES}" after all mvn commands#
+# To use multicore building, use "$mvncmd" instead of "maven"              #
 # 20-50% speed improvement is quite common.                                #
 ############################################################################
 
@@ -48,18 +48,18 @@ case "$1" in
         set -e
 		setupUpstreamAndPatch $2 || exit 1
 		basedir
-        mvn -T ${BUILD_CORES} -N install || exit 1
+        $mvncmd -N install || exit 1
         cd ${FORK_NAME}-API
-        mvn -T ${BUILD_CORES} -e clean install && cd ../${FORK_NAME}-Server && mvn -T ${BUILD_CORES} -e clean install || exit 1
+        $mvncmd -e clean install && cd ../${FORK_NAME}-Server && $mvncmd -e clean install || exit 1
     ) || failed=1
     ;;
     "j" | "launcher" | "jar" | "paperclip")
     (
 	   setupUpstreamAndPatch $2 || exit 1
        basedir
-       mvn -T ${BUILD_CORES} -N install
+       $mvncmd -N install
        cd ${FORK_NAME}-API
-       mvn -T ${BUILD_CORES} -e clean install && cd ../${FORK_NAME}-Server && mvn -T ${BUILD_CORES} -e clean install
+       $mvncmd -e clean install && cd ../${FORK_NAME}-Server && $mvncmd -e clean install
        basedir
        $scriptdir/installLauncher.sh "$basedir"
     ) || failed=1
@@ -67,9 +67,9 @@ case "$1" in
     "d" | "de" | "deploy")
     (
         basedir
-        mvn -T ${BUILD_CORES} -N install
+        $mvncmd -N install
         cd ${FORK_NAME}-API
-        mvn -T ${BUILD_CORES} clean deploy && cd ../${FORK_NAME}-Server && mvn -T ${BUILD_CORES} clean install
+        $mvncmd clean deploy && cd ../${FORK_NAME}-Server && $mvncmd clean install
     )
     ;;
     "u" | "up" | "upstream" | "update")
diff --git a/scripts/functions.sh b/scripts/functions.sh
index ffeda4a5a..99f03ec74 100755
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -9,7 +9,7 @@ MCDEV_REPO=""
 
 # Added Multithreading to builds
 # By JosephWorks
-BUILD_CORES="$(nproc --all)"
+mvncmd="mvn -T 1.5C"
 
 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"
 
diff --git a/scripts/updateUpstream.sh b/scripts/updateUpstream.sh
index 048039744..6ac55034e 100755
--- a/scripts/updateUpstream.sh
+++ b/scripts/updateUpstream.sh
@@ -48,7 +48,7 @@ paperdir
 ./paper patch
 
 #cd "Paper-Server"
-#mcVer=$(mvn -T ${BUILD_CORES} -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')
+#mcVer=$($mvncmd -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')
 
 #echo "  $(bashcolor 1 32)(1/$subtasks)$(bashcolorend) - Import necessary sources.."
 #basedir