moved deploy_features to MarwStuff

This commit is contained in:
Erik Bročko 2018-10-05 19:34:32 +02:00
parent 48ca6d4d8f
commit 1f25c23944
3 changed files with 29 additions and 49 deletions

View File

@ -5,6 +5,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/MarwCore"/>
<classpathentry kind="var" path="M2_REPO/me/lucko/luckperms/luckperms-api/4.2/luckperms-api-4.2.jar" sourcepath="M2_REPO/me/lucko/luckperms/luckperms-api/4.2/luckperms-api-4.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar" sourcepath="M2_REPO/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/spigotmc/spigot-api/1.12-R0.1-SNAPSHOT/spigot-api-1.12-R0.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/spigotmc/spigot-api/1.12-R0.1-SNAPSHOT/spigot-api-1.12-R0.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" sourcepath="M2_REPO/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-sources.jar"/>

View File

@ -1,20 +0,0 @@
#!/bin/bash
if [[ "Darwin" == `uname` ]]; then
MC_PATH="../../server"
cp "$1" "../../server/plugins/MarwCore/modules/$2.jar"
"$MC_PATH/cmd.sh" "marw reload $2"
else
LXC_CONT="marw"
MC_USER="mc"
MC_PATH="/home/mc/factions"
lxc file push "$1" "$LXC_CONT$MC_PATH/plugins/MarwCore/modules/$2.jar"
lxc exec $LXC_CONT chown $MC_USER:$MC_USER "$MC_PATH/plugins/MarwCore/modules/$2.jar"
lxc exec $LXC_CONT -- sudo -u $MC_USER "$MC_PATH/cmd.sh" "marw reload $2"
fi
exit 0

View File

@ -29,7 +29,6 @@
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>Version Calculation</id>
<phase>deploy</phase>
<goals>
<goal>exec</goal>
@ -37,7 +36,7 @@
</execution>
</executions>
<configuration>
<executable>${basedir}/deploy_feature.sh</executable>
<executable>${project.parent.basedir}/deploy_feature.sh</executable>
<arguments>
<argument>${project.build.directory}/${project.build.finalName}.jar</argument>
<argument>${project.artifactId}</argument>
@ -47,9 +46,8 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<outputDirectory> ${project.build.outputDirectory}/resources</outputDirectory>
<outputDirectory>${project.build.outputDirectory}/resources</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>