Update to include update.sh, to detect auto updates

1 files changed, 31 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bcaf624be207..8cfd790424df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=crashplan
 pkgver=8.8.1
 _pkgtimestamp=1525200006881
 _pkgbuild=36
-pkgrel=1
+pkgrel=2
 pkgdesc="An business online/offsite backup solution"
 url="http://www.crashplan.com/business"
 arch=('x86_64')
@@ -14,13 +14,17 @@ depends=('bash' 'java-runtime-headless=8' 'alsa-lib' 'gtk3' 'libxss' 'inetutils'
 # We are trying without gconf or gtk3
 makedepends=('cpio')
 conflicts=('crashplan')
-install=crashplan-pro.install
+# install=crashplan-pro.install
 source=(https://download.code42.com/installs/agent/cloud/${pkgver}/${_pkgbuild}/install/CrashPlanSmb_${pkgver}_${_pkgtimestamp}_${_pkgbuild}_Linux.tgz
-        crashplan-pro
-        crashplan-pro.service)
+        crashplan-pro.service
+        upgrade.sh
+        crashplan-pro_upgrade.service
+        crashplan-pro_upgrade.path)
 sha1sums=('8afc06a75f35be5b6eec68abddd32fb8c8a80871'
-          'c6bf34f1b0ba0bd8d9eb04f6b300112e3c053f84'
-          'ad5a293e832dec5e7f6ef6ba02d4a8a5a1da8941')
+          '068c73e030c4ae12b97960d90d736ad42d41f9de'
+          '3b7a17085cf93170254fb9f29bfc5a683f29f2de'
+          'a6c1f459caefbc581cfe5638cc9cb95894547f17'
+          '844c4fd73692d888f8dd27b145652a9f571d7133')
 options=(!strip)
 build() {
   cd $srcdir/code42-install
@@ -31,16 +35,19 @@ build() {
   echo "  - https://support.code42.com/Terms_and_conditions/Legal_terms_and_conditions/CrashPlan_for_Small_Business_EULA"
   echo ""
 
-  echo "" > install.vars
-  echo "APP_BASENAME=CrashPlan" >> install.vars
-  echo "TARGETDIR=/opt/$_pkgname" >> install.vars
-  echo "PARENT_DIR=/opt/$_pkgname" >> install.vars
-  echo "BINSDIR=" >> install.vars
-  echo "MANIFESTDIR=/opt/$_pkgname/manifest" >> install.vars
-  echo "INITDIR=" >> install.vars
-  echo "RUNLVLDIR=" >> install.vars
-  NOW=`date +%Y%m%d`
-  echo "INSTALLDATE=$NOW" >> install.vars
+  
+
+  cat <<EOF > install.vars
+TARGETDIR=/opt/$_pkgname
+BINSDIR=/opt/$_pkgname/bin
+MANIFESTDIR=/opt/$_pkgname/manifest
+INITDIR=/etc/init.d
+INSTALLDATE=`date +%Y%m%d`
+JAVACOMMON=/opt/$_pkgname/jre/bin/java
+APP_BASENAME=Code42
+DIR_BASENAME=$_pkgname
+APP_DATA_BASE_NAME_LOWER=crashplan
+EOF
 
   sed -i '/^resolve_native_libraries/ s/./#&/' install.sh
   sed -i '/^install_service_script/ s/./#&/' install.sh
@@ -67,17 +74,13 @@ package() {
   # Fix for encoding troubles (CrashPlan ticket 178827)
   # Make sure the daemon is running using the same localization as
   # the (installing) user
-  echo "" > $srcdir/code42-install/scripts/run.conf
-  echo "LC_ALL=$LANG" >> $srcdir/code42-install/scripts/run.conf
-
-  # Prevent crashplan from restarting itself repeatedly..
-  echo '#!/bin/sh' > bin/restartLinux.sh
-  echo 'exit' >> bin/restartLinux.sh
+  echo "LC_ALL=$LANG" > $srcdir/code42-install/scripts/run.conf
 
   install -D -m 644 $srcdir/code42-install/install.vars install.vars
   install -D -m 644 $srcdir/code42-install/scripts/run.conf bin/run.conf
   install -D -m 755 $srcdir/code42-install/scripts/code42.desktop $pkgdir/usr/share/applications/crashplan.desktop
   install -D -m 755 $srcdir/code42-install/scripts/service.sh bin/service.sh
+  install -D -m 755 $srcdir/upgrade.sh bin/upgrade.sh
 
   # We need to change the name for now
   ln -sf "/opt/$_pkgname/bin/Code42Service" $pkgdir/opt/crashplan/bin/CrashPlanService 
@@ -86,6 +89,12 @@ package() {
 
   # systemd unit
   install -D -m 644 $srcdir/crashplan-pro.service $pkgdir/usr/lib/systemd/system/crashplan-pro.service
+  install -D -m 644 $srcdir/crashplan-pro_upgrade.service $pkgdir/usr/lib/systemd/system/crashplan-pro_upgrade.service
+  install -D -m 644 $srcdir/crashplan-pro_upgrade.path $pkgdir/usr/lib/systemd/system/crashplan-pro_upgrade.path
+}
+
+pre_upgrade() {
+  rm -rf /opt/crashplan/upgrade/*
 }
 
 post_install() {