From 75f7fd17cb6b30d99899130fed61d4eaa6cb3537 Mon Sep 17 00:00:00 2001 From: Sotr Date: Mon, 13 Apr 2020 21:30:41 +0700 Subject: [PATCH] Possibly fix import scripts --- scripts/applyPatches.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index b10f28a18..e67cbe2b1 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -41,9 +41,11 @@ 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" ] && [ $baseproject != "Paper/Paper-API" ]; then - echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.." - basedir && $scriptdir/importSources.sh $basedir 1 || exit 1 + if [ $needimport == "0" ]; then + if [ $baseproject != "${FORK_NAME}-Server" ]; then + echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.." + basedir && $scriptdir/importSources.sh $basedir 1 || exit 1 + fi fi basedir