diff --git a/plugin.yml b/plugin.yml index 3443f02..678832c 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,10 +1,10 @@ -name: Craft Inc. Gates -version: 2.2.0-DEV +name: ${project.name} +version: ${project.version} description: A plugin to create gates for fast traveling. softdepend: [Vault] author: tomco, s1m0ne authors: [oloflarsson, locutus, DrAgonmoray, s1m0ne, tomco] -website: http://www.craftinc.de/craftinc-gates/ +website: http://dev.bukkit.org/bukkit-plugins/craftinc-gates/ main: de.craftinc.gates.Plugin database: false diff --git a/pom.xml b/pom.xml index d51a6a3..3540dc2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,16 @@ 4.0.0 de.craftinc CraftIncGates + Craft Inc. Gates jar - 2.2.0-DEV + 2.2.0-beta UTF-8 + ${project.name} ${project.version} src @@ -58,14 +60,14 @@ org.bukkit bukkit - 1.5.2-R0.1 + 1.5.2-R1.0 jar compile org.bukkit craftbukkit - 1.5.2-R0.1 + 1.5.2-R1.0 jar compile diff --git a/scripts/test-deployment.sh b/scripts/test-deployment.sh index 6dc5b8b..6529ac9 100755 --- a/scripts/test-deployment.sh +++ b/scripts/test-deployment.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_DIR=$(dirname "$0") +SCRIPT_DIR="$(dirname "$0")" DEVELOPER=$(whoami) @@ -14,18 +14,15 @@ else START_STOP_SCRIPT="$SCRIPT_DIR/minecraft.sh" fi - +# TODO: This is a bad solution! Maven should write necessary information into an extra file. +ARTIFACT_ID="$(grep -C5 'de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '' | sed 's/[ \t]*//g' | sed 's/<\/name>[ \t]*//g')" # TODO: This is a bad solution! Maven should write necessary information into an extra file. -ARTIFACT_ID="$(grep -C3 'de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '' | sed 's/[ \t]*//g' | sed 's/<\/artifactId>[ \t]*//g')" - -# TODO: This is a bad solution! Maven should write necessary information into an extra file. -VERSION="$(grep -C3 'de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '' | sed 's/[ \t]*//g' | sed 's/<\/version>[ \t]*//g')" - +VERSION="$(grep -C5 'de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '' | sed 's/[ \t]*//g' | sed 's/<\/version>[ \t]*//g')" mkdir -p "$PLUGIN_DIR" -cp "$SCRIPT_DIR/../target/$ARTIFACT_ID-$VERSION".jar "$PLUGIN_DIR/" +cp "$SCRIPT_DIR/../target/$ARTIFACT_ID $VERSION".jar "$PLUGIN_DIR/" echo -e "ddidderr\nmice_on_drugs\nMochaccino\nbeuth_el_max" > "$BUKKIT_DIR/ops.txt"