Jwineman/fix upgrade cron checks incorrect version

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.0.1](#6.0.1) - 2016-05-05
+### Fixed
+- The cloudflare_update.sh bash script was incorrectly checking the current version number causing the update to fail. [#79](https://github.com/cloudflare/CloudFlare-CPanel/pull/79)
+
 ## [6.0.0](#6.0.0) - 2016-04-28
 ### Added
 - Added the ability to configure the IPV6 functionality on the Performance Page

cloudflare_update.sh

@@ -29,7 +29,7 @@ if [ "$HOST_KEY" = "" ]; then
 fi
 
 # Get the version of the plugin currently installed on the server
-INSTALLED_VERSION=`cat /usr/local/cpanel/base/frontend/paper_lantern/cloudflare/composer.json | grep version | cut -d "\"" -f 4`
+INSTALLED_VERSION=`cat /usr/local/cpanel/base/frontend/paper_lantern/cloudflare/config.js | grep version | cut -d "\"" -f 4`
 
 # What is the latest version of the plugin that is available
 CURRENT_VERSION=`curl -s https://api.cloudflare.com/host-gw.html -d "act=cpanel_info" -d "host_key=$HOST_KEY" | sed -e 's/[{}]/''/g' | awk -v k="text" '{n=split($0,a,","); for (i=1; i<=n; i++) print a[i]}' | grep cpanel_latest | cut -d "\"" -f 6`

sync.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+#$1 = username
+#$2 = hostname
+USRHOSTFLDR="$1@$2:/usr/local"
+
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./proxy.live.php $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/proxy.live.php
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./index.live.php $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/index.live.php
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./stylesheets/ $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/stylesheets
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./assets/ $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/assets
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./fonts/ $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/fonts
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./compiled.js $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/compiled.js
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./compiled.js.map $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/compiled.js.map
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./config.js $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/config.js
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./lang/ $USRHOSTFLDR/cpanel/base/frontend/paper_lantern/cloudflare/lang
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./CloudFlare.pm $USRHOSTFLDR/cpanel/Cpanel/API/CloudFlare.pm
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./APIKey $USRHOSTFLDR/cpanel/bin/admin/CloudFlare/APIKey
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./vendor/ $USRHOSTFLDR/cpanel/3rdparty/php/54/lib/php/cloudflare/vendor
+rsync -avz --no-owner --no-group --no-perms --copy-dirlinks -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress ./src/ $USRHOSTFLDR/cpanel/3rdparty/php/54/lib/php/cloudflare/src