From 0a4dc842c6f64fe05511e08ccc82872274baef79 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 25 Apr 2015 08:03:32 -0400 Subject: [PATCH] Trying and failing to get Purugin working --- bukkit/.gitignore | 5 +++++ bukkit/Makefile | 28 +++++++++++++++++++++++++--- bukkit/craftbukkit | 8 +++++--- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/bukkit/.gitignore b/bukkit/.gitignore index aa69598..eeb9e6c 100644 --- a/bukkit/.gitignore +++ b/bukkit/.gitignore @@ -16,3 +16,8 @@ world/ world_nether/ world_the_end/ plugins/ +jruby-complete.jar +banned-ips.txt +banned-players.txt +ops.txt +white-list.txt diff --git a/bukkit/Makefile b/bukkit/Makefile index 1832227..012f06d 100644 --- a/bukkit/Makefile +++ b/bukkit/Makefile @@ -1,14 +1,36 @@ -CRAFTBUKKIT_VERSION := 1.8.3-R0.1-SNAPSHOT-latest +CRAFTBUKKIT_VERSION := 1.7.2-R0.2 +CRAFTBUKKIT_FULL_VERSION := 1.7.2-R0.4-20140216.012104-3 +PURUGIN_VERSION := 0.7.1 +DEPS := \ + craftbukkit.jar \ + eula.txt \ + plugins/Purugin.jar \ + jruby-complete.jar .PHONY: all all: deps .PHONY: deps -deps: craftbukkit.jar eula.txt +deps: $(DEPS) + +.PHONY: clean +clean: + rm -vf $(DEPS) craftbukkit.jar: curl -SL --progress -o $@ \ - http://tcpr.ca/download/craftbukkit/craftbukkit-$(CRAFTBUKKIT_VERSION).jar + http://tcpr.ca/download/craftbukkit/craftbukkit-$(CRAFTBUKKIT_FULL_VERSION).jar eula.txt: echo "eula=true" > $@ + +plugins/Purugin.jar: plugins + curl -SL --progress -o $@ \ + http://dev.bukkit.org/media/files/765/560/purugin-$(PURUGIN_VERSION)-bukkit-$(CRAFTBUKKIT_VERSION).jar + +plugins: + mkdir -p $@ + +jruby-complete.jar: + curl -SL --progress -o $@ \ + https://s3.amazonaws.com/jruby.org/downloads/1.7.19/jruby-complete-1.7.19.jar diff --git a/bukkit/craftbukkit b/bukkit/craftbukkit index dad6b66..fd1a5c1 100755 --- a/bukkit/craftbukkit +++ b/bukkit/craftbukkit @@ -1,10 +1,12 @@ #!/bin/bash set -o errexit -: ${JAVA_OPTS:=-Xmx1G} -: ${BUKKIT_ARGS:=-o true} - TOP=$(dirname ${BASH_SOURCE[0]}) cd "${TOP}" +: ${JAVA_OPTS:=-Xmx1G -cp "${TOP}/jruby-complete.jar"} +: ${BUKKIT_ARGS:=-o true} +: ${GEM_HOME:=${TOP}/gems} + +set -x exec java ${JAVA_OPTS} -jar "${TOP}/craftbukkit.jar" ${BUKKIT_ARGS}