Upgrading Upsource to 2.5.4934

3 files changed, 32 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf779af86de0..f87aba58dc34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = upsource
 	pkgdesc = Repository Browsing and Code Review tool from JetBrains
-	pkgver = 2.0.4
+	pkgver = 2.5
 	pkgrel = 1
 	url = https://www.jetbrains.com/upsource/
 	install = upsource.install
@@ -8,10 +8,13 @@ pkgbase = upsource
 	license = Commercial
 	depends = java-runtime-headless
 	options = !strip
-	source = https://download.jetbrains.com/upsource/upsource-2.0.3682.zip
+	backup = opt/upsource/data,
+	backup = opt/upsource/conf,
+	backup = opt/upsource/backups
+	source = https://download.jetbrains.com/upsource/upsource-2.5.4934.zip
 	source = upsource.service
 	source = upsource.conf
-	sha256sums = a1ed8144adb83e7d60233a69e247ce622494a0469b87943e52425a97ef855cdd
+	sha256sums = 9544844e148112683c17086682a184edcce85baf25f3af0d7be1db5183f7ad77
 	sha256sums = 90d447198d5ccb96985860a4d1e3b82fa6bfa2ce0def4e7214fbc2dcfe93add7
 	sha256sums = 1d216f3e4494a665860a5ca2b295bb22640b6fe5a34e7149fcfd2dfb3026c55f
 
diff --git a/PKGBUILD b/PKGBUILD
index 20c67bfb9ed5..560652588b8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Based on Teamcity PKGBUILD by Nowaker
 
 pkgname=upsource
-pkgver=2.0.4
-_build=2.0.3682
+pkgver=2.5
+_build=4934
 pkgrel=1
 pkgdesc='Repository Browsing and Code Review tool from JetBrains'
 arch=('any')
@@ -11,14 +11,25 @@ url="https://www.jetbrains.com/upsource/"
 license=('Commercial')
 depends=('java-runtime-headless')
 install="$pkgname.install"
-source=("https://download.jetbrains.com/upsource/upsource-${_build}.zip"
+source=("https://download.jetbrains.com/upsource/upsource-${pkgver}.${_build}.zip"
         'upsource.service'
 	'upsource.conf')
-sha256sums=('a1ed8144adb83e7d60233a69e247ce622494a0469b87943e52425a97ef855cdd'
+sha256sums=('9544844e148112683c17086682a184edcce85baf25f3af0d7be1db5183f7ad77'
             '90d447198d5ccb96985860a4d1e3b82fa6bfa2ce0def4e7214fbc2dcfe93add7'
 	    '1d216f3e4494a665860a5ca2b295bb22640b6fe5a34e7149fcfd2dfb3026c55f')
 options=('!strip')
 PKGEXT='.pkg.tar'
+backup=('opt/upsource/data', 'opt/upsource/conf', 'opt/upsource/backups')
+
+prepare() {
+    if [ -d /opt/upsource ] && ! find /opt/upsource/backups/ -mindepth 1 -type d -mtime 0 | egrep -q '.*'  ;
+    then
+       echo "No recent backup found in /opt/upsource/backups/"
+       echo "Please create a manual backup from the web interface"
+       echo "or remove this check if you know what you are doing."
+       exit 1
+    fi
+}
 
 package() {
   mkdir -p "${pkgdir}/usr/share/licenses"
diff --git a/upsource.install b/upsource.install
index 554b992cc35d..4236f0b7e8ee 100644
--- a/upsource.install
+++ b/upsource.install
@@ -8,28 +8,27 @@ post_install() {
     echo "If you want to use a different Java, set it in /etc/conf.d/upsource"
     echo ""
     echo "To start your instance:"
-    echo "  systemctl start upsource"
+    echo "  # systemctl start upsource"
     echo 
     echo "After that you can access Upsource by opening http://localhost:8080/"
 }
 
 pre_upgrade() {
+    if ! find /opt/upsource/backups/ -mindepth 1 -type d -mtime 0 | egrep -q '.*' ; then 
+	echo "WARNING: No recent backup found in /opt/upsource/backups/"
+    fi
+
     echo "Shutting down Upsource for upgrade..."
     systemctl stop upsource
-    echo "Moving conf and data directories..."
-    mv /opt/upsource/conf /opt/upsource/conf.upgrade
-    mv /opt/upsource/data /opt/upsource/data.upgrade
 }
 
 post_upgrade() {
-    echo "Restoring conf and data directories..."
-    rm -rf /opt/upsource/conf
-    mv /opt/upsource/conf.upgrade /opt/upsource/conf
-    mv /opt/upsource/data.upgrade /opt/upsource/data
-    echo "Starting Upsource..."
-    systemctl start upsource
-    echo "Make sure /usr/lib/jvm/default-java symlinks to your prefered Java environment."
-    echo "If you want to use a different Java, set it in /etc/conf.d/upsource"
+    echo "Please have a look at /opt/upsource and copy"
+    echo "the old backup to the new location as mentioned in"
+    echo "https://www.jetbrains.com/upsource/help/2.5/upgrade.html"
+    echo
+    echo "After that, start Upsource with"
+    echo "  # systemctl start upsource"
 }
 
 post_remove() {