diff --git a/akarin b/akarin index ee9058baa..c8aae3037 100755 --- a/akarin +++ b/akarin @@ -25,13 +25,13 @@ case "$1" in "a" | "p" | "patch" | "apply") ( set -e - setupUpstreamAndPatch $2 0 || exit 1 + setupUpstreamAndPatch $2 "0" || exit 1 ) || failed=1 ;; "b" | "bu" | "build" | "install") ( set -e - setupUpstreamAndPatch $2 0 || exit 1 + setupUpstreamAndPatch $2 "0" || 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 "0" || exit 1 basedir mvn -N install cd ${FORK_NAME}-API diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index d282f716f..de934f6e3 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -42,7 +42,7 @@ function applyPatch { $gitcmd branch -f upstream "$branch" &> /dev/null && $gitcmd checkout upstream &> /dev/null if [[ $needimport == "0" ]]; then - if [ $baseproject != "${FORK_NAME}-Server" ]; 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 fi