diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index b04d99aa1..b10f28a18 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -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 ] && [ $baseproject != "Paper/Paper-API" ]; then + 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 fi diff --git a/scripts/importSources.sh b/scripts/importSources.sh index b6acd3762..218d24ca2 100755 --- a/scripts/importSources.sh +++ b/scripts/importSources.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash maintask=$2 -if [ ! $maintask ]; then +if [ $maintask == "0" ]; then TASKTITLE="Import Sources" else TASKTITLE="Import Sources (Subtask)" @@ -14,7 +14,6 @@ echo " " echo "----------------------------------------" echo " $(bashcolor 1 32)Task$(bashcolorend) - $TASKTITLE" echo " This will import unimported newly added/mod sources to Paper workspace" -echo " " echo "----------------------------------------" # SCRIPT HEADER end @@ -121,7 +120,7 @@ done echo -e "Extra dev imports of Akarin:\n\n$IMPORT_LOG" | git commit src -F - &> /dev/null echo " $(bashcolor 1 32)Succeed$(bashcolorend) - Sources have been imported to Paper/Paper-Server" - if [ $maintask ]; then # this is magical + if [ $maintask != "0" ]; then # this is magical echo "----------------------------------------" echo " Subtask finished" echo "----------------------------------------"