From 2f2481c65eb4eee8879bfd3cc8c3129a0f317966 Mon Sep 17 00:00:00 2001
From: Schuyler Cebulskie <Gawdl3y@gawdl3y.com>
Date: Fri, 2 Jun 2017 00:34:18 -0400
Subject: [PATCH] Clean up Travis stuff MOAR

---
 .travis.yml                       |   6 +++---
 {deploy => travis}/deploy-key.enc | Bin
 {deploy => travis}/deploy.sh      |   3 +--
 {deploy => travis}/test.sh        |   1 -
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename {deploy => travis}/deploy-key.enc (100%)
 rename {deploy => travis}/deploy.sh (95%)
 rename {deploy => travis}/test.sh (99%)

diff --git a/.travis.yml b/.travis.yml
index d6acd934e..fb2f6214c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ install: npm install
 jobs:
   include:
     - stage: test
-      script: bash ./deploy/test.sh
-    - stage: build
-      script: bash ./deploy/deploy.sh
+      script: bash ./travis/test.sh
+    - stage: deploy
+      script: bash ./travis/deploy.sh
 env:
   global:
     - ENCRYPTION_LABEL: "af862fa96d3e"
diff --git a/deploy/deploy-key.enc b/travis/deploy-key.enc
similarity index 100%
rename from deploy/deploy-key.enc
rename to travis/deploy-key.enc
diff --git a/deploy/deploy.sh b/travis/deploy.sh
similarity index 95%
rename from deploy/deploy.sh
rename to travis/deploy.sh
index fe9f1ab19..08264264e 100644
--- a/deploy/deploy.sh
+++ b/travis/deploy.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 # Adapted from https://gist.github.com/domenic/ec8b0fc8ab45f39403dd.
-
 set -e
 
 # For revert branches, do nothing
@@ -47,7 +46,7 @@ ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
 ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
 ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
 ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy/deploy-key.enc -out deploy-key -d
+openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in travis/deploy-key.enc -out deploy-key -d
 chmod 600 deploy-key
 eval `ssh-agent -s`
 ssh-add deploy-key
diff --git a/deploy/test.sh b/travis/test.sh
similarity index 99%
rename from deploy/test.sh
rename to travis/test.sh
index 52812d4eb..bef6134e9 100644
--- a/deploy/test.sh
+++ b/travis/test.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -e
 
 # For revert branches, do nothing