From 6d6cb733a9fd777be26f470880c2af6ca0c7f8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bro=C4=8Dko?= Date: Fri, 5 Oct 2018 19:34:32 +0200 Subject: [PATCH] moved deploy_features to MarwStuff --- Stats/deploy_feature.sh | 20 -------------------- Stats/pom.xml | 15 +++++++-------- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100755 Stats/deploy_feature.sh diff --git a/Stats/deploy_feature.sh b/Stats/deploy_feature.sh deleted file mode 100755 index f1c429f..0000000 --- a/Stats/deploy_feature.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/Stats/pom.xml b/Stats/pom.xml index b293c31..418dc31 100644 --- a/Stats/pom.xml +++ b/Stats/pom.xml @@ -37,20 +37,19 @@ - ${basedir}/deploy_feature.sh + ${project.parent.basedir}/deploy_feature.sh ${project.build.directory}/${project.build.finalName}.jar ${project.artifactId} - - maven-resources-plugin - - ${project.build.outputDirectory}/resources - - - + + maven-resources-plugin + + ${project.build.outputDirectory}/resources + +