From owner-svn-ports-all@freebsd.org Fri Jun 26 16:22:57 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C611298D86F; Fri, 26 Jun 2015 16:22:57 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B65871ED5; Fri, 26 Jun 2015 16:22:57 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QGMvGc028981; Fri, 26 Jun 2015 16:22:57 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QGMvuM028975; Fri, 26 Jun 2015 16:22:57 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201506261622.t5QGMvuM028975@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Fri, 26 Jun 2015 16:22:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390648 - in head/games/minecraft-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 16:22:58 -0000 Author: robak Date: Fri Jun 26 16:22:56 2015 New Revision: 390648 URL: https://svnweb.freebsd.org/changeset/ports/390648 Log: games/minecraft-server: improvements to startup script PR: 200743 Submitted by: Jonathan Price (maintainer) Modified: head/games/minecraft-server/Makefile head/games/minecraft-server/files/minecraft.in Modified: head/games/minecraft-server/Makefile ============================================================================== --- head/games/minecraft-server/Makefile Fri Jun 26 16:21:02 2015 (r390647) +++ head/games/minecraft-server/Makefile Fri Jun 26 16:22:56 2015 (r390648) @@ -2,6 +2,7 @@ PORTNAME= minecraft-server PORTVERSION= 1.8.7 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/ DISTNAME= minecraft_server.${PORTVERSION}.jar Modified: head/games/minecraft-server/files/minecraft.in ============================================================================== --- head/games/minecraft-server/files/minecraft.in Fri Jun 26 16:21:02 2015 (r390647) +++ head/games/minecraft-server/files/minecraft.in Fri Jun 26 16:22:56 2015 (r390648) @@ -20,18 +20,23 @@ load_rc_config $name minecraft_mem=${minecraft_mem:-"1024M"} minecraft_args=${minecraft_args:-""} -extra_commands="console status" +extra_commands="console status kill" start_cmd="${name}_start" stop_cmd="${name}_stop" console_cmd="${name}_console" status_cmd="${name}_status" +kill_cmd="${name}_kill" -minecraft_start() +is_running() { pgrep -qu mcserver java - isrunning=$? - if [ ${isrunning} -eq 0 ]; then - echo "${name} already running." + return $? +} + +minecraft_start() +{ + if is_running; then + echo "${name} is already running." else echo "Starting ${name}." cd %%PREFIX%%/minecraft-server @@ -41,36 +46,32 @@ minecraft_start() minecraft_stop() { - pgrep -qu mcserver java - isrunning=$? - if [ ${isrunning} -eq 0 ]; then + if is_running; then echo "Stopping ${name}." su mcserver -c "%%LOCALBASE%%/bin/tmux send-keys -t ${name} \"stop\" ENTER" i=0 while [ $i -lt 10 ]; do i=$(($i + 1)) - pgrep -qu mcserver java - stillrunning=$? - if [ ${stillrunning} -eq 0 ]; then + if is_running; then sleep 1 else - echo "${name} stopped." + echo "${name} has been stopped." return fi done - echo "ERROR: ${name} could not be stopped." + echo "WARN: ${name} could not be stopped or is taking longer than expected." + echo "WARN: To view the console, type 'service ${name} console'" + echo "WARN: To kill $[name}, type 'service ${name} kill'" else - echo "${name} not running." + echo "${name} is not running." fi } minecraft_console() { - pgrep -qu mcserver java - isrunning=$? - if [ ${isrunning} -ne 0 ]; then - echo "${name} not running." + if ! is_running; then + echo "${name} is not running." else export TERM=xterm su mcserver -c "%%LOCALBASE%%/bin/tmux attach-session -t ${name}" @@ -79,13 +80,21 @@ minecraft_console() minecraft_status() { - pgrep -qu mcserver java - isrunning=$? - if [ ${isrunning} -eq 0 ]; then + if is_running; then echo "${name} is running." else echo "${name} is not running." fi } +minecraft_kill() +{ + if ! is_running; then + echo "${name} is not running." + else + pkill -KILL -u mcserver java + echo "${name} has been killed." + fi +} + run_rc_command "$1"