Change JAVA_HOME to /usr/lib/jvm/default

4 files changed, 6 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e482959cc37b..bdc5462fe45d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,7 @@ pkgbase = teamcity
 	sha512sums = 2ae69d942bf29f0b03d33766a2ad7bb7eb614641148ba42540e3eab45e5906291e91fec8fba6641276881c4d859ab917530340b790323cf800bc31e7724dd5c1
 	sha512sums = bf8786f45d9b9101027b6efe2e1732988d032cb1ae1655b2188b61eda70d0df49d48c0de191e2eb00378fd44722a61592fcd26f5426ff150fc72d78b448a3223
 	sha512sums = db22f7e9a58b57df260343973f9338a5828ed7b4949ba45dd6fa26905b502f4a91766cd685d16c3d41cef51c107ea54ac41dda263729c1ba1aee665295a614e3
-	sha512sums = f6a1fb4c66f2303fca3fbba511f8a34eb9489fa0e76997e73753dd25d31dae3f8188bff1ff03782b1333b4704090cb10d86d81260677701dc5d8cc48ffa463e4
+	sha512sums = b8d7ca447939f4883dc673db8cb94ae5663af3baf7027ca18b151c004e0c2323ed710218eed3e5d1f191ea6412476a9f23d72eff61aae414200253735612b66c
 
 pkgname = teamcity
 
diff --git a/PKGBUILD b/PKGBUILD
index 832b005c7b04..ab5c1afd50c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ source=("http://download.jetbrains.com/teamcity/TeamCity-${pkgver}.tar.gz"
 sha512sums=('2ae69d942bf29f0b03d33766a2ad7bb7eb614641148ba42540e3eab45e5906291e91fec8fba6641276881c4d859ab917530340b790323cf800bc31e7724dd5c1'
             'bf8786f45d9b9101027b6efe2e1732988d032cb1ae1655b2188b61eda70d0df49d48c0de191e2eb00378fd44722a61592fcd26f5426ff150fc72d78b448a3223'
             'db22f7e9a58b57df260343973f9338a5828ed7b4949ba45dd6fa26905b502f4a91766cd685d16c3d41cef51c107ea54ac41dda263729c1ba1aee665295a614e3'
-            'f6a1fb4c66f2303fca3fbba511f8a34eb9489fa0e76997e73753dd25d31dae3f8188bff1ff03782b1333b4704090cb10d86d81260677701dc5d8cc48ffa463e4')
+            'b8d7ca447939f4883dc673db8cb94ae5663af3baf7027ca18b151c004e0c2323ed710218eed3e5d1f191ea6412476a9f23d72eff61aae414200253735612b66c')
 options=('!strip')
 PKGEXT='.pkg.tar'
 
diff --git a/teamcity.conf b/teamcity.conf
index 4c41545276b4..e4ed4db93d4d 100644
--- a/teamcity.conf
+++ b/teamcity.conf
@@ -1,3 +1,2 @@
-JAVA_HOME=/usr/lib/jvm/default-java
+JAVA_HOME=/usr/lib/jvm/default
 CATALINA_PID=/opt/teamcity/logs/teamcity-server.pid
-
diff --git a/teamcity.install b/teamcity.install
index 1c25036df2f9..7819e2d06b90 100644
--- a/teamcity.install
+++ b/teamcity.install
@@ -4,18 +4,18 @@ post_install() {
     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-java symlinks to your prefered Java environment."
+    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"
     echo ""
     echo "To start your instance:"
     echo "  systemctl start teamcity-server"
     echo "  systemctl start teamcity-agent"
-    echo 
+    echo
     echo "Hint for newcomers: by default, TeamCity operates on port 8111."
 }
 
 post_upgrade() {
-    echo "Make sure /usr/lib/jvm/default-java symlinks to your prefered Java environment."
+    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"
 }