Upissue to 8.2.0, name change is required at some point

3 files changed, 32 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a73202d43c9..ee943464e2dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = crashplan-pro
 	pkgdesc = An business online/offsite backup solution
-	pkgver = 8.0.0
+	pkgver = 8.2.0
 	pkgrel = 1
 	url = http://www.crashplan.com/business
 	install = crashplan-pro.install
@@ -13,14 +13,15 @@ pkgbase = crashplan-pro
 	depends = gconf
 	depends = gtk3
 	depends = libxss
+	depends = inetutils
 	conflicts = crashplan
 	options = !strip
-	source = https://download.code42.com/installs/agent/cloud/8.0.0/778/install/CrashPlanSmb_8.0.0_1525200006800_778_Linux.tgz
+	source = https://download.code42.com/installs/agent/cloud/8.2.0/487/install/CrashPlanSmb_8.2.0_1525200006820_487_Linux.tgz
 	source = crashplan-pro
 	source = crashplan-pro.service
-	sha256sums = 77e89b5a6c5d7baf1c97a0960dc724d08e14ffaff523466414499f22f7f9e20d
+	sha256sums = 32601c720b9b21e13dd1143d0d6028deff8a897f26590d62a55a7a2aedf00864
 	sha256sums = b306d7da0dd41341512ce80ddcfb21bff8a9bb73ab5018696e69d08b89f7f1b6
-	sha256sums = fd4c80dbd2ea3dcfc9966832a599f1bb310f705f813474d1900c1867ea55155c
+	sha256sums = 6fcd25dd576c2a352262d3e63aff42f7af3934a4409cc30d9557ebaba5ca46fa
 
 pkgname = crashplan-pro
 
diff --git a/PKGBUILD b/PKGBUILD
index aefaf497c362..5abebe4ac61e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,27 @@
 # <billyburly [at] gmail [dot] com>
 pkgname=crashplan-pro
 _pkgname=crashplan
-pkgver=8.0.0
-_pkgtimestamp=1525200006800
-_pkgbuild=778
+pkgver=8.2.0
+_pkgtimestamp=1525200006820
+_pkgbuild=487
 pkgrel=1
 pkgdesc="An business online/offsite backup solution"
 url="http://www.crashplan.com/business"
 arch=('x86_64')
 license=('custom')
-depends=('bash' 'java-runtime-headless=8' 'alsa-lib' 'gconf' 'gtk3' 'libxss')
+depends=('bash' 'java-runtime-headless=8' 'alsa-lib' 'gconf' 'gtk3' 'libxss' 'inetutils')
 makedepends=('cpio')
 conflicts=('crashplan')
 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)
-sha256sums=('77e89b5a6c5d7baf1c97a0960dc724d08e14ffaff523466414499f22f7f9e20d'
+sha256sums=('32601c720b9b21e13dd1143d0d6028deff8a897f26590d62a55a7a2aedf00864'
             'b306d7da0dd41341512ce80ddcfb21bff8a9bb73ab5018696e69d08b89f7f1b6'
-            'fd4c80dbd2ea3dcfc9966832a599f1bb310f705f813474d1900c1867ea55155c')
+            '6fcd25dd576c2a352262d3e63aff42f7af3934a4409cc30d9557ebaba5ca46fa')
 options=(!strip)
 build() {
-  cd $srcdir/crashplan-install
+  cd $srcdir/code42-install
 
   echo ""
   echo "You must review and agree to the EULA before using CrashPlan PRO."
@@ -34,6 +34,7 @@ build() {
   echo "JAVACOMMON=`which java`" >> 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
@@ -41,20 +42,21 @@ build() {
   NOW=`date +%Y%m%d`
   echo "INSTALLDATE=$NOW" >> install.vars
 
-  sed -imod 's|\. $TARGETDIR/bin/run\.conf|:|' scripts/CrashPlanEngine
-  sed -imod "s|Exec=.*|Exec=/opt/$_pkgname/bin/CrashPlanDesktop|" scripts/CrashPlan.desktop
-  sed -imod "s|Icon=.*|Icon=/opt/$_pkgname/bin/icon_app.png|" scripts/CrashPlan.desktop
-  sed -imod "s|Categories=.*|Categories=System;|" scripts/CrashPlan.desktop
+  # sed -imod 's|\. $TARGETDIR/bin/run\.conf|:|' scripts/CrashPlanEngine
+  #sed -imod "s|Exec=.*|Exec=/opt/$_pkgname/bin/CrashPlanDesktop|" scripts/instll.sh
+  #sed -imod "s|Icon=.*|Icon=/opt/$_pkgname/bin/icon_app.png|" scripts/install.sh
+  # sed -imod "s|Categories=.*|Categories=System;|" scripts/CrashPlan.desktop
+  #$srcdir/code42-install/install.sh -v -u $USER
 }
 
 package() {
   mkdir -p $pkgdir/opt/$_pkgname
   cd $pkgdir/opt/$_pkgname
 
-  cat $srcdir/crashplan-install/CrashPlanSmb_$pkgver.cpi | gzip -d -c - | cpio -i --no-preserve-owner
+  cat $srcdir/code42-install/CrashPlanSmb_$pkgver.cpi | gzip -d -c - | cpio -i --no-preserve-owner
 
   chmod 777 log
-  chmod 775 electron/crashplan
+  chmod 775 electron/code42
 
   mv app.asar electron/resources
 
@@ -66,18 +68,22 @@ package() {
   # Fix for encoding troubles (CrashPlan ticket 178827)
   # Make sure the daemon is running using the same localization as
   # the (installing) user
-  echo "" >> $srcdir/crashplan-install/scripts/run.conf
-  echo "LC_ALL=$LANG" >> $srcdir/crashplan-install/scripts/run.conf
+  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
 
-  install -D -m 644 $srcdir/crashplan-install/install.vars install.vars
-  install -D -m 755 $srcdir/crashplan-install/scripts/CrashPlanDesktop bin/CrashPlanDesktop
-  install -D -m 644 $srcdir/crashplan-install/scripts/run.conf bin/run.conf
-  install -D -m 755 $srcdir/crashplan-install/scripts/CrashPlanEngine bin/CrashPlanEngine
-  install -D -m 755 $srcdir/crashplan-install/scripts/CrashPlan.desktop $pkgdir/usr/share/applications/crashplan.desktop
+  install -D -m 644 $srcdir/code42-install/install.vars install.vars
+  install -D -m 755 $srcdir/code42-install/scripts/desktop.sh bin/CrashPlanDesktop
+  install -D -m 644 $srcdir/code42-install/scripts/run.conf bin/run.conf
+  install -D -m 755 $srcdir/code42-install/scripts/service.sh bin/CrashPlanEngine
+  install -D -m 755 $srcdir/code42-install/scripts/code42.desktop $pkgdir/usr/share/applications/crashplan.desktop
+  install -D -m 755 $srcdir/code42-install/scripts/code42.desktop $pkgdir/usr/share/applications/crashplan.desktop
+
+  # We need to change the name for now
+  ln -sf $pkgdir/opt/crashplan/bin/Code42Service $pkgdir/opt/crashplan/bin/CrashPlanService 
 
   # rc.d daemon
   install -D -m 755 $srcdir/crashplan-pro $pkgdir/etc/rc.d/crashplan-pro
diff --git a/crashplan-pro.service b/crashplan-pro.service
index 88f7c2614b3b..2e6375ab8a58 100644
--- a/crashplan-pro.service
+++ b/crashplan-pro.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 
 Type=forking
-PIDFile=/opt/crashplan/CrashPlanEngine.pid
+PIDFile=/opt/crashplan/Code42Service.pid
 EnvironmentFile=/opt/crashplan/bin/run.conf
 WorkingDirectory=/opt/crashplan
 ExecStart=/opt/crashplan/bin/CrashPlanEngine start