aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authorjgh <jgh@FreeBSD.org>2012-03-10 03:03:06 +0800
committerjgh <jgh@FreeBSD.org>2012-03-10 03:03:06 +0800
commit09e5635c1da849975a24c0bcada17c48aabb704a (patch)
tree6b53484e93fec8019bf741e6be696bf82a208f9d /games
parentb6072f38b41e344d9dc4373131cf60e022f81620 (diff)
downloadfreebsd-ports-gnome-09e5635c1da849975a24c0bcada17c48aabb704a.tar.gz
freebsd-ports-gnome-09e5635c1da849975a24c0bcada17c48aabb704a.tar.zst
freebsd-ports-gnome-09e5635c1da849975a24c0bcada17c48aabb704a.zip
- Use full path for java to resolve server startup operations
- bump PORTREVISION PR: ports/165884 Submitted by: ler@lerctr.org Approved by: maintainer, freebsd@rakor-net.de Feature safe: yes
Diffstat (limited to 'games')
-rw-r--r--games/minecraft-server/Makefile1
-rw-r--r--games/minecraft-server/files/minecraft.in12
2 files changed, 7 insertions, 6 deletions
diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 78d15866818e..93c5b3abd6b6 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= minecraft-server
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= http://s3.amazonaws.com/MinecraftDownload/launcher/ \
http://denkrobat.de/minecraft/ \
diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in
index bd068e3c5d40..ac1015b0a64e 100644
--- a/games/minecraft-server/files/minecraft.in
+++ b/games/minecraft-server/files/minecraft.in
@@ -27,7 +27,7 @@ if [ -e %%DATADIR%%/server.log.lck ]; then
else
echo "Starting Minecraft-Server..."
cd %%DATADIR%%
- /usr/bin/su %%USERS%% -c "%%PREFIX%%/bin/tmux new-session -d -s minecraft \"java -Xmx1024M -Xms1024M -jar %%DATADIR%%/minecraft_server.jar nogui\""
+ /usr/bin/su %%USERS%% -c "%%LOCALBASE%%/bin/tmux new-session -d -s minecraft \"%%LOCALBASE%%/bin/java -Xmx1024M -Xms1024M -jar %%DATADIR%%/minecraft_server.jar nogui\""
i=0
while [ $i -lt 15 ]; do
@@ -41,8 +41,8 @@ else
done
if [ $i -ge 10 ]; then
- echo "ERROR: Server could not be startet."
- /usr/bin/su %%USERS%% -c "%%PREFIX%%/bin/tmux kill-session -t minecraft"
+ echo "ERROR: Server could not be started."
+ /usr/bin/su %%USERS%% -c "%%LOCALBASE%%/bin/tmux kill-session -t minecraft"
fi
fi
}
@@ -50,7 +50,7 @@ fi
minecraft_stop(){
if [ -e %%DATADIR%%/server.log.lck ]; then
echo "Halting Minecraft-Server."
- /usr/bin/su %%USERS%% -c "%%PREFIX%%/bin/tmux send -t minecraft:0.0 stop \"Enter\""
+ /usr/bin/su %%USERS%% -c "%%LOCALBASE%%/bin/tmux send -t minecraft:0.0 stop \"Enter\""
i=0
@@ -59,13 +59,13 @@ if [ -e %%DATADIR%%/server.log.lck ]; then
if [ -e %%DATADIR%%/server.log.lck ]; then
sleep 1
else
- echo "Minecraft-Server haltet."
+ echo "Minecraft-Server halted."
break
fi
done
if [ $i -ge 10 ];then
- echo "ERROR: Server could not be haltet."
+ echo "ERROR: Server could not be halted."
fi
else
echo "Minecraft-Server not running."