update to 10.0

4 files changed, 15 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 65ecd5dc58d6..2e9b3624f82a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: ahmad200512@yandex.ru
 
 pkgname=teamcity
-pkgver=9.1.3
+pkgver=10.0
 pkgrel=1
 pkgdesc='Continuous integration server from JetBrains'
 arch=('any')
@@ -15,10 +15,10 @@ source=("http://download.jetbrains.com/teamcity/TeamCity-${pkgver}.tar.gz"
         'teamcity-agent.service'
         'teamcity-server.service'
         'teamcity.conf')
-sha512sums=('f436220a6222c2fcc4dfc9f50ad2236cedce624555a10fe41294f9c17bebefd9cb703ab64c883bd0a813e9dc98b3f2173c6217218d99fe104078badaf88317b8'
+sha512sums=('760cd9332f14124e668fd9ccd426c48d74003ca3a3884701d3b91c02999546d0fe917ce42b5cc3665fa505ced49c958d751b6acc75f812566cbb93f1e1b9edbd'
             'bf8786f45d9b9101027b6efe2e1732988d032cb1ae1655b2188b61eda70d0df49d48c0de191e2eb00378fd44722a61592fcd26f5426ff150fc72d78b448a3223'
-            'db22f7e9a58b57df260343973f9338a5828ed7b4949ba45dd6fa26905b502f4a91766cd685d16c3d41cef51c107ea54ac41dda263729c1ba1aee665295a614e3'
-            'b8d7ca447939f4883dc673db8cb94ae5663af3baf7027ca18b151c004e0c2323ed710218eed3e5d1f191ea6412476a9f23d72eff61aae414200253735612b66c')
+            '4cf06ff10623ede0e37fd76727845c9574ef52f2309f93bb44604422cbce633b0cfeed783bc1a5840c457cc8f3e602cb10e9b995a30ca94097d51da23534a063'
+            'c2997eafd5cefdb68340815d3286418dfb37e9ba9ab1f3147e89c21ebcdb7fdb5392b7a36b592ea1f4ab0f68da4f5bfc38ae25b475ac3ff10794e99049ea558b')
 options=('!strip')
 PKGEXT='.pkg.tar'
 
diff --git a/teamcity-server.service b/teamcity-server.service
index f1759a4563c2..2c13bc630372 100644
--- a/teamcity-server.service
+++ b/teamcity-server.service
@@ -7,7 +7,7 @@ EnvironmentFile=/etc/conf.d/teamcity
 ExecStart=/opt/teamcity/bin/teamcity-server.sh start
 ExecStop=/opt/teamcity/bin/teamcity-server.sh stop
 Type=forking
-PIDFile=/opt/teamcity/logs/teamcity-server.pid
+PIDFile=/opt/teamcity/logs/teamcity.pid
 Restart=no
 TimeoutSec=30
 RemainAfterExit=yes
diff --git a/teamcity.conf b/teamcity.conf
index e4ed4db93d4d..addaec7b4508 100644
--- a/teamcity.conf
+++ b/teamcity.conf
@@ -1,2 +1,2 @@
 JAVA_HOME=/usr/lib/jvm/default
-CATALINA_PID=/opt/teamcity/logs/teamcity-server.pid
+CATALINA_PID=/opt/teamcity/logs/teamcity.pid
diff --git a/teamcity.install b/teamcity.install
index 23e0c663bd63..e866d7f2d341 100644
--- a/teamcity.install
+++ b/teamcity.install
@@ -1,26 +1,23 @@
 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 -G teamcity teamcity >/dev/null
-  chown -R teamcity '/opt/teamcity'
-  chown -R teamcity '/var/lib/teamcity'
-  echo "Make sure /usr/lib/jvm/default symlinks to your prefered Java environment."
+  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
   echo "If you want to use a different Java, set it in /etc/conf.d/teamcity"
-  echo ""
-  echo "To start your instance:"
+  echo
+  echo "To start Teamcity instance:"
   echo "  systemctl start teamcity-server"
   echo "  systemctl start teamcity-agent"
   echo
-  echo "Hint for newcomers: by default, TeamCity operates on port 8111."
+  echo "Default TeamCity port is 8111."
 }
 
 post_upgrade() {
-  echo "Make sure /usr/lib/jvm/default symlinks to your prefered Java environment."
-  echo "If you want to use a different Java, set it in /etc/conf.d/teamcity"
 }
 
 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
+  getent passwd teamcity >/dev/null && userdel teamcity >/dev/null
+  getent group teamcity >/dev/null && groupdel teamcity >/dev/null
 }