minecraft-server: Notify users on switch to tmux

Furthermore, fix an inconsistent print statement in the management
script.

4 files changed, 10 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb58203c9a8c..882719327e44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,6 +32,6 @@ pkgbase = minecraft-server
 	sha512sums = a62c8c04e08dbac0db0aa2eeb505d70f8fd925bd2e427899512ba3ac828d4644e1c43c8d92325c6bc49c8d9ecb40cb5c44bf5957a63980b1e2cf86fdb38a05a7
 	sha512sums = a74f4e31065b6c6f5c830182de05a8c75a6de6eaac7b3dc26479827646ef20ab872509aac88be613048c97d378711c38612ec7ac92d22134acefd40f6e0a99da
 	sha512sums = 30e434ba183527da8047b1ffe403a083f1af34dbd229b5871222e9da0004cdf5d4152eaa4b73215befcb1233d08cc757af32ad6b572f4b6d2a623b6f120aa0d9
-	sha512sums = 5c61109ae8c22049091cfbec73e76f3dfc65fa24036fe505d135c71d826fcda975e1cfcb28c5e80c075bfb13e5d8bcaef58b9685af721ed87e37776baf1661ec
+	sha512sums = c18b6c28095a6195edfbf782c2e0f2caed59692d837d9cb4599ee0458f9ac658006c181ccda31cf078a7864676897163d6458e217c453bd637dadfe9ddd25d0b
 
 pkgname = minecraft-server
diff --git a/PKGBUILD b/PKGBUILD
index 6f3df3b2c222..bcb499151776 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ sha512sums=('fe6e48e2cee38224d2c88f04c19afca9c21fddbe6077b5538e0a0581c2f6c4478ec
             'a62c8c04e08dbac0db0aa2eeb505d70f8fd925bd2e427899512ba3ac828d4644e1c43c8d92325c6bc49c8d9ecb40cb5c44bf5957a63980b1e2cf86fdb38a05a7'
             'a74f4e31065b6c6f5c830182de05a8c75a6de6eaac7b3dc26479827646ef20ab872509aac88be613048c97d378711c38612ec7ac92d22134acefd40f6e0a99da'
             '30e434ba183527da8047b1ffe403a083f1af34dbd229b5871222e9da0004cdf5d4152eaa4b73215befcb1233d08cc757af32ad6b572f4b6d2a623b6f120aa0d9'
-            '5c61109ae8c22049091cfbec73e76f3dfc65fa24036fe505d135c71d826fcda975e1cfcb28c5e80c075bfb13e5d8bcaef58b9685af721ed87e37776baf1661ec')
+            'c18b6c28095a6195edfbf782c2e0f2caed59692d837d9cb4599ee0458f9ac658006c181ccda31cf078a7864676897163d6458e217c453bd637dadfe9ddd25d0b')
 
 _game="minecraft"
 _server_root="/srv/minecraft"
diff --git a/minecraft-server.install b/minecraft-server.install
index 5ffa51a8e838..2b5a8e331049 100644
--- a/minecraft-server.install
+++ b/minecraft-server.install
@@ -2,6 +2,13 @@ _game="minecraft"
 _user="minecraft"
 _server_root="/srv/minecraft"
 
+post_upgrade() {
+	echo "The management script switched from GNU screen to tmux."
+	echo "Manual intervention is needed to close the previous GNU screen sessions:"
+	echo "Use \`sudo -u minecraft screen -S minecraft -rx\` to attach to the minecraft session and stop it."
+	echo "Do the same for the \`idle_server_minecraft\` session if one is running."
+}
+
 post_install() {
 	echo "The world data is stored under ${_server_root} and the server runs as ${_user} user to increase security."
 	echo "Use the ${_game} script under /usr/bin/${_game}d to start, stop or backup the server."
diff --git a/minecraftd.sh b/minecraftd.sh
index 415ca6f8e83d..cd696721ab7a 100755
--- a/minecraftd.sh
+++ b/minecraftd.sh
@@ -282,7 +282,7 @@ server_status() {
 		# Calculating memory usage
 		for p in $(${SUDO_CMD} pgrep -f "${MAIN_EXECUTABLE}"); do
 			ps -p"${p}" -O rss | tail -n 1;
-		done | gawk '{ count ++; sum += $2 }; END {count --; print "Number of processes =", count, "(tmux, bash,", count-1, "x server)"; print "Total memory usage =", sum/1024, "MB" ;};'
+		done | gawk '{ count ++; sum += $2 }; END {count --; print "Number of processes =", count, "(tmux,", count-1, "x server)"; print "Total memory usage =", sum/1024, "MB" ;};'
 	else
 		echo -e "Status:\e[39;1m stopped\e[0m"
 	fi