From 4ca3b129e244cd92f2ac35f79bff037264a6b5db Mon Sep 17 00:00:00 2001
From: moocowmoo <moo@dash.org>
Date: Sun, 16 Apr 2017 01:13:58 +0000
Subject: [PATCH] bugfix - repair PR CI - skip deploy dep init on PRs

---
 .travis.yml            | 11 ++---------
 script/deploy-rsync.sh | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100755 script/deploy-rsync.sh

diff --git a/.travis.yml b/.travis.yml
index 795ad92..8955506 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,10 @@ env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   - CXX=g++-4.8
-  - secure: aXYO6rBvt1dONEoYw0tScSTAoM+la0nfy7CJw/DTxhN05YjayJqLreZXEnHgCweeFyVIgmMJags0VAKfuUFPm8x5DOl7GF1t0KcvPb8acihgWS2p6pIeM7zJf3maGoC/AcOlvBZHMQcZAHsNi1O1Oc/+G/bvM3PaXXlEHb9cMbn8Kz+CzhMqRNMfu8c2REWB4OsR1HXf1KRTE7p4LhDgs7e9+0tDlfORID4jt9YgSou6flSjfovDNO3IWFvhIiwvipwSNw7XdCgPqyCoHjMFF0OctOKEwUnbkYt9ICEKbnmakqduShZVpKzhRI09dvmBks/t8ZJifopEjC+sxeQV9gWc/DALKgEeqIaKf4PQKfFs7OhksOaWhjxo17RQsUX3uMNIjuaszgh5Z2ppG/a4DQi1OqLOApp5AcDcGfh8u91E2nVUEtRgikQoxy5dwcAXgW8iu/ROVD/X0Vp7siKEchyek68SkOy6VK/fKa/sJX7zddIy8kx2bIeUnqR0yOD3yIzZGRinWm4R98DwMd38DuE+qdgVVO2n5npfSxfkvG67sahEGQ0UZWFZOi8le3FOR2f+LNqcA9NAlOeH14MQW8vd5MTbguUBeDew1E+NSQyT6P1K1bJHCio/OPi1TiaUSXXFeuuKqyC95VmD6Ln5uKDoo4DGg2JBgl2whkIGLpI=
 sudo: false
 addons:
   ssh_known_hosts:
-  - $hostname
+  - www-test.dash.org
   - 146.185.153.42
   apt:
     sources:
@@ -21,16 +20,10 @@ addons:
     packages:
     - g++-4.8
 before_install:
-- openssl aes-256-cbc -k "$dash_org_pem_pass" -in dash.org-test-web.pem.enc -out dash.org-test-web.pem -d
 - rvm install 2.3.1
-before_deploy:
-- eval "$(ssh-agent -s)"
-- chmod 600 $TRAVIS_BUILD_DIR/$IdentityFile
-- ssh-add $TRAVIS_BUILD_DIR/$IdentityFile
 deploy:
   provider: script
   skip_cleanup: true
-  script: rsync -r -c -v --delete-after --exclude-from 'ciexclude.txt' $TRAVIS_BUILD_DIR/_site/
-    $user@$hostname:$production_path
+  script: test $TRAVIS_TEST_RESULT = 0 && script/deploy-rsync.sh
   on:
     branch: master
diff --git a/script/deploy-rsync.sh b/script/deploy-rsync.sh
new file mode 100755
index 0000000..f738129
--- /dev/null
+++ b/script/deploy-rsync.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# punt if PR
+if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then
+    echo "IS PULL REQUEST: Skipping deploy rsync"
+elif [[ ! -z "$dash_org_pem_pass" ]]; then
+    echo -n "DEPLOY - decrypting key..."
+    openssl aes-256-cbc -k "$dash_org_pem_pass" -in dash.org-test-web.pem.enc -out dash.org-test-web.pem -d
+    chmod 600 dash.org-test-web.pem
+    echo "DONE"
+    echo "DEPLOY - copying content..."
+    export RSYNC_RSH='ssh -i dash.org-test-web.pem'
+    rsync -r -c -v --delete-after --exclude-from 'ciexclude.txt' $TRAVIS_BUILD_DIR/_site/ $user@$hostname:$production_path
+    echo "DONE"
+else
+    echo "SKIPPING SITE DEPLOY "
+fi