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

Actually fix scripts

Browse Source
This commit is contained in:
Sotr
2020-04-13 21:40:08 +07:00
parent 75f7fd17cb
commit df40958a45
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 == "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

4
scripts/importSources.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
maintask=$2
if [ $maintask == "0" ]; then
if [[ $maintask == "0" ]]; then
TASKTITLE="Import Sources"
else
TASKTITLE="Import Sources (Subtask)"
@@ -120,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 != "0" ]; then # this is magical
if [[ $maintask != "0" ]]; then # this is magical
echo "----------------------------------------"
echo " Subtask finished"
echo "----------------------------------------"