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

fix scripts/applyPatches.sh and update upstream

Browse Source
This commit is contained in:
ㄗㄠˋ ㄑㄧˊ
2020-04-13 10:43:24 +08:00
parent 43ef314288
commit b6e993f8d3
16 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/applyPatches.sh
View File

@@ -40,7 +40,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 ] && [ $baseproject != "Paper/Paper-API" ]; then
echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.."
basedir && $scriptdir/importSources.sh $basedir 1
fi