update to 2017.1.1

5 files changed, 30 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 312694fa8e15..799651c47816 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = teamcity
 	pkgdesc = Continuous integration server from JetBrains
-	pkgver = 2017.1
+	pkgver = 2017.1.1
 	pkgrel = 1
 	url = http://www.jetbrains.com/teamcity/
 	install = teamcity.install
@@ -8,13 +8,15 @@ pkgbase = teamcity
 	license = custom:JetBrains TeamCity
 	depends = java-runtime-headless
 	options = !strip
-	source = http://download.jetbrains.com/teamcity/TeamCity-2017.1.tar.gz
+	source = http://download.jetbrains.com/teamcity/TeamCity-2017.1.1.tar.gz
 	source = teamcity-agent.service
 	source = teamcity-server.service
 	source = teamcity.conf
-	sha512sums = a87f9664865322f594a61859b02483d137a0f017a24a8465e6a6b8af5378d106b2af22ef4aa10b5d755e34743aaf4dd8abc2b2c3855bbdf4a1f4240559e4b0e0
+	source = teamcity.confd
+	sha512sums = f7af0cfe53297430667d80d2f83530820ff017454da8206fec1adae8739a1195ac01aaee01d5c833e0f65aa610af97dd70ac35896eb7f015e95641fef24a12f7
 	sha512sums = bf8786f45d9b9101027b6efe2e1732988d032cb1ae1655b2188b61eda70d0df49d48c0de191e2eb00378fd44722a61592fcd26f5426ff150fc72d78b448a3223
 	sha512sums = 4cf06ff10623ede0e37fd76727845c9574ef52f2309f93bb44604422cbce633b0cfeed783bc1a5840c457cc8f3e602cb10e9b995a30ca94097d51da23534a063
+	sha512sums = 7f13bbb039741a66836d4a2e48ce348e2cc22bf198c932179017654f15275c8f811bed6cc131d4639b8f98ae72dbf7ecac0894b74cf287c5b1d4079da1191e1a
 	sha512sums = c2997eafd5cefdb68340815d3286418dfb37e9ba9ab1f3147e89c21ebcdb7fdb5392b7a36b592ea1f4ab0f68da4f5bfc38ae25b475ac3ff10794e99049ea558b
 
 pkgname = teamcity
diff --git a/PKGBUILD b/PKGBUILD
index 57021642fcc3..3cf50c42f721 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Yegorius <yegorius@domic.us>
 
 pkgname=teamcity
-pkgver=2017.1
+pkgver=2017.1.1
 pkgrel=1
 pkgdesc='Continuous integration server from JetBrains'
 arch=('any')
@@ -12,22 +12,31 @@ install="$pkgname.install"
 source=("http://download.jetbrains.com/teamcity/TeamCity-${pkgver}.tar.gz"
         'teamcity-agent.service'
         'teamcity-server.service'
-        'teamcity.conf')
-sha512sums=('a87f9664865322f594a61859b02483d137a0f017a24a8465e6a6b8af5378d106b2af22ef4aa10b5d755e34743aaf4dd8abc2b2c3855bbdf4a1f4240559e4b0e0'
+        'teamcity.conf'
+        'teamcity.confd')
+sha512sums=('f7af0cfe53297430667d80d2f83530820ff017454da8206fec1adae8739a1195ac01aaee01d5c833e0f65aa610af97dd70ac35896eb7f015e95641fef24a12f7'
             'bf8786f45d9b9101027b6efe2e1732988d032cb1ae1655b2188b61eda70d0df49d48c0de191e2eb00378fd44722a61592fcd26f5426ff150fc72d78b448a3223'
             '4cf06ff10623ede0e37fd76727845c9574ef52f2309f93bb44604422cbce633b0cfeed783bc1a5840c457cc8f3e602cb10e9b995a30ca94097d51da23534a063'
+            '7f13bbb039741a66836d4a2e48ce348e2cc22bf198c932179017654f15275c8f811bed6cc131d4639b8f98ae72dbf7ecac0894b74cf287c5b1d4079da1191e1a'
             'c2997eafd5cefdb68340815d3286418dfb37e9ba9ab1f3147e89c21ebcdb7fdb5392b7a36b592ea1f4ab0f68da4f5bfc38ae25b475ac3ff10794e99049ea558b')
 options=('!strip')
 PKGEXT='.pkg.tar'
 
 package() {
-  mkdir -p "${pkgdir}/usr/share/licenses"
-  mkdir -p "${pkgdir}/var/lib/teamcity"
-  mkdir -p "${pkgdir}/opt/${pkgname}"
+  mkdir -p "$pkgdir/usr/share/licenses"
+  mkdir -p "$pkgdir/var/lib/teamcity/buildAgent/"{system,temp,work}
+  mkdir -p "$pkgdir/opt/teamcity"
 
-  install -Dm755 "${srcdir}/teamcity-agent.service" "${pkgdir}/usr/lib/systemd/system/teamcity-agent.service"
-  install -Dm755 "${srcdir}/teamcity-server.service" "${pkgdir}/usr/lib/systemd/system/teamcity-server.service"
-  install -Dm755 "${srcdir}/teamcity.conf" "${pkgdir}/etc/conf.d/teamcity"
-  cp -R "${srcdir}/TeamCity"/* "${pkgdir}/opt/${pkgname}"
-  ln -s "/opt/${pkgname}/licenses" "${pkgdir}/usr/share/licenses/teamcity"
+  install -Dm644 "$srcdir/teamcity-agent.service" "$pkgdir/usr/lib/systemd/system/teamcity-agent.service"
+  install -Dm644 "$srcdir/teamcity-server.service" "$pkgdir/usr/lib/systemd/system/teamcity-server.service"
+  install -Dm644 "$srcdir/teamcity.confd" "$pkgdir/etc/conf.d/teamcity"
+  install -Dm644 "$srcdir/teamcity.conf" "$pkgdir/usr/lib/sysusers.d/teamcity.conf"
+
+  cp -R "$srcdir/TeamCity"/* "$pkgdir/opt/teamcity"
+  ln -s /opt/teamcity/licenses "$pkgdir/usr/share/licenses/teamcity"
+  sed -e 's|=\.\.|=/var/lib/teamcity/buildAgent|g' -i "$pkgdir/opt/teamcity/buildAgent/conf/buildAgent.properties"
+
+  rm "$pkgdir/opt/teamcity/bin/"*.{bat,cmd,exe}
+  rm "$pkgdir/opt/teamcity/buildAgent/bin/"*.{bat,plist,dist}
+  rm "$pkgdir/opt/teamcity/buildAgent/bin/mac.launchd.sh"
 }
diff --git a/teamcity.conf b/teamcity.conf
index addaec7b4508..e4f0904846e4 100644
--- a/teamcity.conf
+++ b/teamcity.conf
@@ -1,2 +1 @@
-JAVA_HOME=/usr/lib/jvm/default
-CATALINA_PID=/opt/teamcity/logs/teamcity.pid
+u teamcity - - /var/lib/teamcity
diff --git a/teamcity.confd b/teamcity.confd
new file mode 100644
index 000000000000..addaec7b4508
--- /dev/null
+++ b/teamcity.confd
@@ -0,0 +1,2 @@
+JAVA_HOME=/usr/lib/jvm/default
+CATALINA_PID=/opt/teamcity/logs/teamcity.pid
diff --git a/teamcity.install b/teamcity.install
index c35c2026a563..dda16289b177 100644
--- a/teamcity.install
+++ b/teamcity.install
@@ -1,9 +1,6 @@
 post_install() {
-  echo "Creating user and group teamcity..."
-  getent group teamcity >/dev/null || groupadd -r teamcity >/dev/null
-  getent passwd teamcity >/dev/null || useradd -r -g teamcity -d /var/lib/teamcity -s /bin/bash teamcity >/dev/null
-  chown -R teamcity /opt/teamcity
-  chown -R teamcity /var/lib/teamcity
+  systemd-sysusers teamcity.conf
+  chown -R teamcity /opt/teamcity /var/lib/teamcity
   echo "If you want to use a different Java, set it in /etc/conf.d/teamcity"
   echo
   echo "To start Teamcity instance:"
@@ -12,13 +9,3 @@ post_install() {
   echo
   echo "Default TeamCity port is 8111."
 }
-
-post_upgrade() {
-  true
-}
-
-post_remove() {
-  echo "Removing teamcity user and group..."
-  getent passwd teamcity >/dev/null && userdel teamcity >/dev/null
-  getent group teamcity >/dev/null && groupdel teamcity >/dev/null
-}