Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Possibly fix build

Browse Source
This commit is contained in:
Sotr
2020-04-13 22:00:15 +07:00
parent 1a234f3daf
commit 8aed0bbc0f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
akarin
View File

@@ -10,7 +10,7 @@ function setupUpstreamAndPatch {
if [ "$1" != "skipPaper" ]; then
$scriptdir/updateUpstream.sh "$basedir" 0 || exit 1 # not update submodule
fi
$scriptdir/applyPatches.sh "$basedir" $2 || exit 1
$scriptdir/applyPatches.sh "$basedir" || exit 1
}
failed=0
@@ -25,13 +25,13 @@ case "$1" in
"a" | "p" | "patch" | "apply")
(
set -e
setupUpstreamAndPatch $2 "0" || exit 1
setupUpstreamAndPatch $2 || exit 1
) || failed=1
;;
"b" | "bu" | "build" | "install")
(
set -e
setupUpstreamAndPatch $2 "0" || exit 1
setupUpstreamAndPatch $2 || exit 1
basedir
mvn -N install || exit 1
cd ${FORK_NAME}-API
@@ -40,7 +40,7 @@ case "$1" in
;;
"j" | "launcher" | "jar" | "paperclip")
(
setupUpstreamAndPatch $2 "0" || exit 1
setupUpstreamAndPatch $2 || exit 1
basedir
mvn -N install
cd ${FORK_NAME}-API

2
scripts/applyPatches.sh
View File

@@ -41,7 +41,7 @@ function applyPatch {
$gitcmd branch -D upstream >/dev/null &> /dev/null
$gitcmd branch -f upstream "$branch" &> /dev/null && $gitcmd checkout upstream &> /dev/null
if [[ $needimport == "0" ]]; then
if [[ $needimport != "1" ]]; then
if [ $baseproject != "${FORK_NAME}-API" ]; then
echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.."
basedir && $scriptdir/importSources.sh $basedir 1 || exit 1