Fix -server.service to handle the new chained startup scripts

4 files changed, 39 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8642fe7219e..4eea0ae9d4d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = teamcity
 	pkgdesc = Continuous integration server from JetBrains
 	pkgver = 2017.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.jetbrains.com/teamcity/
 	install = teamcity.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index da5f4896cff7..d8f6b1c7d679 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=teamcity
 pkgver=2017.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Continuous integration server from JetBrains'
 arch=('any')
 url="http://www.jetbrains.com/teamcity/"
diff --git a/teamcity-server.service b/teamcity-server.service
index 2c13bc630372..064f0ced41d3 100644
--- a/teamcity-server.service
+++ b/teamcity-server.service
@@ -4,13 +4,12 @@ After=network.target
 
 [Service]
 EnvironmentFile=/etc/conf.d/teamcity
-ExecStart=/opt/teamcity/bin/teamcity-server.sh start
+ExecStart=/opt/teamcity/bin/teamcity-server.sh run
 ExecStop=/opt/teamcity/bin/teamcity-server.sh stop
-Type=forking
+Type=simple
 PIDFile=/opt/teamcity/logs/teamcity.pid
 Restart=no
 TimeoutSec=30
-RemainAfterExit=yes
 User=teamcity
 
 [Install]
diff --git a/update.sh b/update.sh
index 69329f238007..21cb0f346568 100755
--- a/update.sh
+++ b/update.sh
@@ -1,24 +1,43 @@
 #!/bin/bash
+
+# BEGIN functions for version comparison
+verlte() {
+    [  "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
+}
+
+verlt() {
+    [ "$1" = "$2" ] && return 1 || verlte $1 $2
+}
+# END functions
+
+
 wget -O teamcity.json "https://data.services.jetbrains.com/products/releases?code=TC&latest=true&type=release&downloads=linux"
 downloadLink=`JSON.sh -b < teamcity.json | grep '\["TC",0,"downloads","linux","link"\]' | sed -r 's/.*(https.*)"/\1/'`
 checksumLink=`JSON.sh -b < teamcity.json | grep '\["TC",0,"downloads","linux","checksumLink"\]' | sed -r 's/.*(https.*)"/\1/'`
 pkgver=`JSON.sh -b < teamcity.json | grep '\["TC",0,"version"\]' | cut -f2 | cut -d "\"" -f2`
+oldpkgver=`grep -oP '(?<=pkgver = ).*' .SRCINFO`
 
-wget $downloadLink
-wget $checksumLink
-
-checksumFile=$(sed -r 's|.*/(.*\.tar\.gz\.sha256)|\1|' <<< $checksumLink)
-downloadFile=$(sed -r 's|.*/(.*\.tar\.gz)|\1|' <<< $downloadLink)
-
-sha256sum --status -c "$checksumFile"
+verlt $oldpkgver $pkgver
 if [ $? -eq 0 ]; then
-    checksum=`sha256sum "TeamCity-$pkgver.tar.gz" | cut -d " " -f1`
-    sed -ri "s/pkgver=.*/pkgver=$pkgver/" ./PKGBUILD
-    sed -ri "s/sha256sums=\('.*'/sha256sums=\('$checksum'/" ./PKGBUILD
-    sed -ri "s|source=\(.*|source=\('$downloadLink'|" ./PKGBUILD
-    makepkg --printsrcinfo > .SRCINFO
-    rm $checksumFile
-    rm $downloadFile
-else
-    echo "An error occured"
+
+    wget $downloadLink
+    wget $checksumLink
+    
+    checksumFile=$(sed -r 's|.*/(.*\.tar\.gz\.sha256)|\1|' <<< $checksumLink)
+    downloadFile=$(sed -r 's|.*/(.*\.tar\.gz)|\1|' <<< $downloadLink)
+    
+    sha256sum --status -c "$checksumFile"
+    if [ $? -eq 0 ]; then
+        checksum=`sha256sum "TeamCity-$pkgver.tar.gz" | cut -d " " -f1`
+        sed -ri "s/pkgver=.*/pkgver=$pkgver/" ./PKGBUILD
+        sed -ri "s/sha256sums=\('.*'/sha256sums=\('$checksum'/" ./PKGBUILD
+        sed -ri "s|source=\(.*|source=\('$downloadLink'|" ./PKGBUILD
+        makepkg --printsrcinfo > .SRCINFO
+        rm $checksumFile
+        rm $downloadFile
+        printf "Built updated TeamCity package.\n\nOld version: %s\nNew version: %s" "$oldpkgver" "$pkgver" | mail -s "TeamCity package was updated" "qg83d18rbg@pomail.net"
+        printf "Built updated TeamCity package.\n\nOld version: %s\nNew version: %s" "$oldpkgver" "$pkgver" | mail -s "TeamCity package was updated" "mastacheata+aur@gmail.com"
+    else
+        echo "An error occured"
+    fi
 fi