Prefer nmap's ncat for the idle server daemon as it immediately quits upon connection, thus rebooting the server earlier than both gnu-netcat and openbsd-netcat.

3 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 308a9a72784c..26b24819d955 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = papermc-14
 	depends = awk
 	depends = sed
 	optdepends = tar: needed in order to create world backups
-	optdepends = netcat: required in order to suspend an idle server
+	optdepends = netcat: required in order to suspend an idle server (recommended: nmap-netcat)
 	conflicts = papermc-git
 	conflicts = papermc
 	noextract = papermc.1.14.4+b238.jar
@@ -30,7 +30,7 @@ pkgbase = papermc-14
 	sha512sums = 51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42
 	sha512sums = f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456
 	sha512sums = 70f7d4e42db9ed5efcde412f018d46628ad9c12198787421cc70aa1e51b8e278b436d480568ca21dabaacf33cfbd37c5e607504f2cd25ed65442ba67b9805958
-	sha512sums = 794e2b66d29f016263305fc65f79be4be78c39c6dda39a777e0e59ede8f20857843f90f021e5258c0ee894073f4e13b3f481643cbcc8a8572ab372c40d878393
+	sha512sums = 3fddefaec25aa4001bce2cf8f654999a5f4736f8315bc23eccbfbaa68032a85481be4813d15898a03fe884345477eb5b28ec0e73fe471f641103fd07b419683b
 	sha512sums = 687c51e16de4e5081066640228664e5aa642e8b61f22ae406b7385eba291c93f21ea7c1b625f27331e88936d405631b996089994d99e5201b71505e5fd08a294
 
 pkgname = papermc-14
diff --git a/PKGBUILD b/PKGBUILD
index 8128bb5b0236..bf8eb815e8e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ url="https://papermc.io/"
 license=('custom')
 depends=('java-runtime-headless>=8' 'screen' 'sudo' 'bash' 'awk' 'sed')
 optdepends=("tar: needed in order to create world backups"
-	"netcat: required in order to suspend an idle server")
+	"netcat: required in order to suspend an idle server (recommended: nmap-netcat)")
 conflicts=('papermc-git' 'papermc')
 backup=('etc/conf.d/papermc')
 install="${pkgname}.install"
@@ -29,7 +29,7 @@ sha512sums=('c16dfbcae4b08ea9ea04564aab8f40161e558d3b197d69bb5dd66a8175f60e03113
             '51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42'
             'f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456'
             '70f7d4e42db9ed5efcde412f018d46628ad9c12198787421cc70aa1e51b8e278b436d480568ca21dabaacf33cfbd37c5e607504f2cd25ed65442ba67b9805958'
-            '794e2b66d29f016263305fc65f79be4be78c39c6dda39a777e0e59ede8f20857843f90f021e5258c0ee894073f4e13b3f481643cbcc8a8572ab372c40d878393'
+            '3fddefaec25aa4001bce2cf8f654999a5f4736f8315bc23eccbfbaa68032a85481be4813d15898a03fe884345477eb5b28ec0e73fe471f641103fd07b419683b'
             '687c51e16de4e5081066640228664e5aa642e8b61f22ae406b7385eba291c93f21ea7c1b625f27331e88936d405631b996089994d99e5201b71505e5fd08a294')
 
 _game="papermc"
diff --git a/papermc.sh b/papermc.sh
index 3f327f394eb8..5948da2006e7 100755
--- a/papermc.sh
+++ b/papermc.sh
@@ -50,10 +50,10 @@ else
 fi
 
 # Choose which flavor of netcat is to be used
-if command -v netcat &> /dev/null; then
-	NETCAT_CMD="netcat"
-elif command -v ncat &> /dev/null; then
+if command -v ncat &> /dev/null; then
 	NETCAT_CMD="ncat"
+elif command -v netcat &> /dev/null; then
+	NETCAT_CMD="netcat"
 else
 	NETCAT_CMD=""
 fi
@@ -139,7 +139,7 @@ idle_server_daemon() {
 					no_player=$(( IDLE_IF_TIME - 300 ))
 					# Game server is down, listen on port ${GAME_PORT} for incoming connections
 					echo -n "Netcat: "
-					${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..."
+					echo "" | ${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..."
 					IDLE_SERVER="false" ${myname} start
 				fi
 			else
@@ -150,8 +150,8 @@ idle_server_daemon() {
 			# Reset timer and give the player 300 seconds to connect after pinging
 			no_player=$(( IDLE_IF_TIME - 300 ))
 			# Game server is down, listen on port ${GAME_PORT} for incoming connections
-			echo -n "Netcat: "
-			${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..."
+			echo -n "Netcat: "netcat
+			echo "" | ${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..."
 			IDLE_SERVER="false" ${myname} start
 		fi
 	done