Skip to content

Commit 862ad95

Browse files
committed
only use paper submodule
1 parent db82b4f commit 862ad95

File tree

4 files changed

+1
-19
lines changed

4 files changed

+1
-19
lines changed

.gitmodules

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
[submodule "work/Bukkit"]
2-
path = work/Bukkit
3-
url = https://hub.spigotmc.org/stash/scm/spigot/bukkit.git
4-
[submodule "work/Spigot"]
5-
path = work/Spigot
6-
url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
71
[submodule "work/Paper"]
82
path = work/Paper
93
url = https://github.com/PaperMC/Paper.git

scripts/upstreamCommit.sh

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,12 @@ function changelog() {
77
base=$(git ls-tree HEAD $1 | cut -d' ' -f3 | cut -f1)
88
cd $1 && git log --oneline ${base}...HEAD
99
}
10-
bukkit=$(changelog work/Bukkit)
11-
spigot=$(changelog work/Spigot)
1210
paper=$(changelog work/Paper)
1311

1412
updated=""
1513
logsuffix=""
16-
if [ ! -z "$bukkit" ]; then
17-
logsuffix="$logsuffix\n\nBukkit Changes:\n$bukkit"
18-
updated="Bukkit"
19-
fi
20-
if [ ! -z "$spigot" ]; then
21-
logsuffix="$logsuffix\n\nSpigot Changes:\n$spigot"
22-
if [ -z "$updated" ]; then updated="Spigot"; else updated="$updated/Spigot"; fi
23-
fi
2414
if [ ! -z "$paper" ]; then
25-
logsuffix="$logsuffix\n\nPaper Changes:\n$spigot"
15+
logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
2616
if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi
2717
fi
2818

work/Bukkit

-1
This file was deleted.

work/Spigot

-1
This file was deleted.

0 commit comments

Comments
 (0)