generate all helper files in pkgbuild

4 files changed, 26 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d632231cd99..918eb5d3e64a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ensime-server
 	pkgdesc = ENSIME server
 	pkgver = 0.9.10
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/ensime/ensime-server
 	arch = x86_64
 	arch = i686
@@ -9,14 +9,8 @@ pkgbase = ensime-server
 	depends = java-environment-jdk
 	noextract = ensime_2.11.6-0.9.10-SNAPSHOT-assembly.jar
 	source = http://ensime.typelevel.org/ensime_2.11.6-0.9.10-SNAPSHOT-assembly.jar
-	source = ensime-server.sh
-	source = ensime-server@.service
 	md5sums = a40de1ec974ad6181f6d4cbe25b29ad0
-	md5sums = a30174add2867d57e1ffbda7d710332a
-	md5sums = 47b40f9db8109d608149d9eb692cbf75
 	sha256sums = 517bf1567e281fcbedd8aaa7298259fada77249df8c661c502a00b2c469deb40
-	sha256sums = 2672e0d537bfaa7911b6342b4efe5e9ceadcdd913145e67ae9c142a5ea1d342a
-	sha256sums = 14916b1802c34786e0f1282876dd2f1b9bacb3557c23363e5cc38a4ef1e2fc40
 
 pkgname = ensime-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c25749a6c95..6bfce60939a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,17 @@ pkgname=ensime-server
 pkgver=0.9.10
 _scalaver=2.11.6
 _kind=SNAPSHOT
-pkgrel=4
+pkgrel=5
 pkgdesc="ENSIME server"
 url="https://github.com/ensime/ensime-server"
 arch=("x86_64" "i686")
 license="custom"
 depends=("java-environment-jdk")
 _jarfile="ensime_${_scalaver}-${pkgver}-${_kind}-assembly.jar"
-source=("http://ensime.typelevel.org/${_jarfile}"
-        "ensime-server.sh"
-        "ensime-server@.service")
+source=("http://ensime.typelevel.org/${_jarfile}")
 noextract=("${_jarfile}")
-md5sums=('a40de1ec974ad6181f6d4cbe25b29ad0'
-         'a30174add2867d57e1ffbda7d710332a'
-         '47b40f9db8109d608149d9eb692cbf75')
-sha256sums=('517bf1567e281fcbedd8aaa7298259fada77249df8c661c502a00b2c469deb40'
-            '2672e0d537bfaa7911b6342b4efe5e9ceadcdd913145e67ae9c142a5ea1d342a'
-            '14916b1802c34786e0f1282876dd2f1b9bacb3557c23363e5cc38a4ef1e2fc40')
+md5sums=('a40de1ec974ad6181f6d4cbe25b29ad0')
+sha256sums=('517bf1567e281fcbedd8aaa7298259fada77249df8c661c502a00b2c469deb40')
 
 build() {
     echo ""
@@ -27,6 +21,25 @@ build() {
 package() {
     mkdir -p "${pkgdir}/usr/lib/ensime" && \
     cp "${srcdir}/${_jarfile}" "${pkgdir}/usr/lib/ensime"
-    install -D -m0755 "${srcdir}/ensime-server.sh" "${pkgdir}/usr/bin/ensime-server"
-    install -D -m0644 "${srcdir}/ensime-server@.service" "${pkgdir}/usr/lib/systemd/user/ensime-server@.service"
+
+    mkdir -p "${pkgdir}/usr/bin" && cat <<SHELL > "${pkgdir}/usr/bin/ensime-server"
+#!/bin/sh
+
+exec /usr/bin/java -Densime.config=\${1:-.}/.ensime -cp /usr/lib/jvm/default/lib/tools.jar:/usr/lib/ensime/${_jarfile} org.ensime.server.Server
+SHELL
+    chmod 0755 "${pkgdir}/usr/bin/ensime-server"
+
+    mkdir -p "${pkgdir}/usr/lib/systemd/user" && cat <<SYSTEMD > "${pkgdir}/usr/lib/systemd/user/ensime-server@.service"
+[Unit]
+Description=ENSIME user server for %i directory
+
+[Service]
+Type=simple
+ExecStartPre=/usr/bin/mkdir -p %I/.ensime_cache
+ExecStartPre=/usr/bin/rm -f %I/.ensime_cache/http %I/.ensime_cache/port
+ExecStart=/usr/bin/ensime-server %I
+
+[Install]
+WantedBy=default.target
+SYSTEMD
 }
diff --git a/ensime-server.sh b/ensime-server.sh
deleted file mode 100755
index 2d51d8cd492e..000000000000
--- a/ensime-server.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/java -Densime.config=${1:-.}/.ensime -cp /usr/lib/jvm/default/lib/tools.jar:/usr/lib/ensime/ensime_2.11.6-0.9.10-SNAPSHOT-assembly.jar org.ensime.server.Server
diff --git a/ensime-server@.service b/ensime-server@.service
deleted file mode 100644
index cb90ce76462b..000000000000
--- a/ensime-server@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=ENSIME user server for %i directory
-
-[Service]
-Type=simple
-ExecStartPre=/usr/bin/mkdir -p %I/.ensime_cache
-ExecStartPre=/usr/bin/rm -f %I/.ensime_cache/http %I/.ensime_cache/port
-ExecStart=/usr/bin/ensime-server %I
-
-[Install]
-WantedBy=default.target