Updated to newest version, and tried found install.sh isn't +x by default

5 files changed, 29 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec3d13d37a10..01bfe48f1f01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = crashplan-pro
 	pkgdesc = An business online/offsite backup solution
-	pkgver = 8.8.1
-	pkgrel = 2
+	pkgver = 8.8.2
+	pkgrel = 1
 	url = http://www.crashplan.com/business
 	arch = x86_64
 	license = custom
@@ -14,15 +14,15 @@ pkgbase = crashplan-pro
 	depends = inetutils
 	conflicts = crashplan
 	options = !strip
-	source = https://download.code42.com/installs/agent/cloud/8.8.1/36/install/CrashPlanSmb_8.8.1_1525200006881_36_Linux.tgz
+	source = https://download.code42.com/installs/agent/cloud/8.8.2/143/install/CrashPlanSmb_8.8.2_1525200006882_143_Linux.tgz
 	source = crashplan-pro.service
 	source = upgrade.sh
 	source = crashplan-pro_upgrade.service
 	source = crashplan-pro_upgrade.path
-	sha1sums = 8afc06a75f35be5b6eec68abddd32fb8c8a80871
+	sha1sums = 8cdd216ee34c4704ff170faa0d932fb5796e1aee
 	sha1sums = 068c73e030c4ae12b97960d90d736ad42d41f9de
-	sha1sums = 3b7a17085cf93170254fb9f29bfc5a683f29f2de
-	sha1sums = a6c1f459caefbc581cfe5638cc9cb95894547f17
-	sha1sums = 844c4fd73692d888f8dd27b145652a9f571d7133
+	sha1sums = 402ff6f7aa67b139871d0d94757a5181a6f927c4
+	sha1sums = aabdb5cbbc45216f8ae9d645758f4f9d6a4892d2
+	sha1sums = 0dfbf0ef3df2ad386419def132c28d63560f6e4e
 
 pkgname = crashplan-pro
diff --git a/PKGBUILD b/PKGBUILD
index 8cfd790424df..4195af1517b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # <billyburly [at] gmail [dot] com>
 pkgname=crashplan-pro
 _pkgname=crashplan
-pkgver=8.8.1
-_pkgtimestamp=1525200006881
-_pkgbuild=36
-pkgrel=2
+pkgver=8.8.2
+_pkgtimestamp=1525200006882
+_pkgbuild=143
+pkgrel=1
 pkgdesc="An business online/offsite backup solution"
 url="http://www.crashplan.com/business"
 arch=('x86_64')
@@ -20,11 +20,11 @@ source=(https://download.code42.com/installs/agent/cloud/${pkgver}/${_pkgbuild}/
         upgrade.sh
         crashplan-pro_upgrade.service
         crashplan-pro_upgrade.path)
-sha1sums=('8afc06a75f35be5b6eec68abddd32fb8c8a80871'
+sha1sums=('8cdd216ee34c4704ff170faa0d932fb5796e1aee'
           '068c73e030c4ae12b97960d90d736ad42d41f9de'
-          '3b7a17085cf93170254fb9f29bfc5a683f29f2de'
-          'a6c1f459caefbc581cfe5638cc9cb95894547f17'
-          '844c4fd73692d888f8dd27b145652a9f571d7133')
+          '402ff6f7aa67b139871d0d94757a5181a6f927c4'
+          'aabdb5cbbc45216f8ae9d645758f4f9d6a4892d2'
+          '0dfbf0ef3df2ad386419def132c28d63560f6e4e')
 options=(!strip)
 build() {
   cd $srcdir/code42-install
diff --git a/crashplan-pro_upgrade.path b/crashplan-pro_upgrade.path
index 611a56120d63..f063a11bf215 100644
--- a/crashplan-pro_upgrade.path
+++ b/crashplan-pro_upgrade.path
@@ -1,8 +1,11 @@
 [Unit]
 Description="File monitor for updates from the Crashplan Daemon"
+Requires=crashplan-pro.service
+After=crashplan-pro.service
+
 
 [Path]
-DirectoryNotEmpty=/opt/crashplan/upgrade
+PathExistsGlob=/opt/crashplan/upgrade/*/install.sh
 Unit=crashplan-pro_upgrade.service
 
 [Install]
diff --git a/crashplan-pro_upgrade.service b/crashplan-pro_upgrade.service
index 99205459fd94..33dc39e4e228 100644
--- a/crashplan-pro_upgrade.service
+++ b/crashplan-pro_upgrade.service
@@ -1,6 +1,11 @@
 [Unit]
 Description=CrashPlanPRO Backup Engine Upgrade
 After=network.target
+Requires=crashplan-pro.service
+After=crashplan-pro.service
+PropogatesReloadTo=crashplan-pro.service
+OnSuccess=crashplan-pro.service
+RefuseManualStart=True
 
 [Service]
 Type=oneshot
diff --git a/upgrade.sh b/upgrade.sh
index c9cf44957839..2d6272a8bfb7 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -13,6 +13,7 @@ if [[ -z $USER ]]; then
   USER=root
 fi
 
+systemctl stop crashplan-pro.service
 cp /opt/crashplan/bin/upgrade.sh ${TMP}/upgrade.sh
 
 echo "Editing ${UPDATE_PATH}/install.sh"
@@ -42,6 +43,8 @@ echo "LC_ALL=$LANG" > ${UPDATE_PATH}/run.conf
 /usr/bin/sed -i '/^[[:blank:]]*strip_keys_from_indentity_file/ s/./#&/' ${UPDATE_PATH}/uninstall.sh
 
 echo "Installing update"
+chmod +x ${UPDATE_PATH}/install.sh
+chmod +x ${UPDATE_PATH}/uninstall.sh
 cd ${UPDATE_PATH} && ${UPDATE_PATH}/install.sh -q -v -u $USER
 
 cp ${TMP}/upgrade.sh /opt/crashplan/bin/upgrade.sh
@@ -59,4 +62,6 @@ ln -sf "/opt/crachplan/bin/service.sh" /opt/crashplan/bin/CrashPlanEngine
 
 rm -rf ${TMP}
 rm -rf /opt/crashplan/upgrade/*
+
+systemctl start crashplan-pro.service
 echo "Done!"