From 69066c674443da740adf547a3513d52a40352693 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 19 Sep 2016 05:30:57 +0900
Subject: [PATCH] Use single jar for release, no need for shell script

---
 server/build.gradle                            | 18 +++++++++++++++++-
 .../dist/etc/linux-systemd/ensichat.service    |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/server/build.gradle b/server/build.gradle
index e9fab0b..458b3f4 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -12,6 +12,22 @@ mainClassName = 'com.nutomic.ensichat.server.Main'
 version = "0.4.0"
 applicationName = 'ensichat-server'
 
+jar {
+    archiveName "${applicationName}.jar"
+    manifest.attributes 'Main-Class': mainClassName
+    from(configurations.compile.collect { it.isDirectory()  ?  it  :  zipTree(it) })
+}
+
+task release(type: Zip)  {
+    archiveName = "$applicationName-${version}.zip"
+    def baseDir = archiveName - '.zip'
+    into(baseDir) {
+        from(project.file('src/dist'))
+        into ('lib') { from ('build/libs/') }
+    }
+}
+release.dependsOn(jar)
+
 run {
     // Use this to pass command line arguments via `gradle run`.
     //
@@ -24,6 +40,6 @@ run {
     // ./gradlew server:run -Pargs="--name,MyName,--status,My Status"
     // ```
     if (project.hasProperty('args')) {
-        args project.args.split("\\s+")
+        args project.args.split('\\s+')
     }
 }
diff --git a/server/src/dist/etc/linux-systemd/ensichat.service b/server/src/dist/etc/linux-systemd/ensichat.service
index 81b42a2..84878f0 100644
--- a/server/src/dist/etc/linux-systemd/ensichat.service
+++ b/server/src/dist/etc/linux-systemd/ensichat.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=ensichat
 Group=ensichat
-ExecStart=/usr/bin/ensichat --name "" --status ""
+ExecStart=/usr/bin/java -jar /usr/lib/ensichat.jar --name "unknown user" --status ""
 WorkingDirectory=/var/lib/ensichat
 RootDirectory=/var/lib/ensichat