From ddeeb3f5881e1f888cb69b08d1e005904e56887d Mon Sep 17 00:00:00 2001
From: Lachlan Kermode <lachiekermode@gmail.com>
Date: Mon, 17 Dec 2018 10:49:12 +0000
Subject: [PATCH] refactor encrypt script to be more readable

---
 .env.enc           | Bin 1936 -> 1888 bytes
 .travis.yml        |   2 ++
 scripts/encrypt.sh |  35 ++++++++++++++++++++++-------------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.env.enc b/.env.enc
index 063d190c7a653a6bec0f2853247e52c1780e631b..4424eafaf51a9c82bd56511360d5c14657dcd51c 100644
GIT binary patch
literal 1888
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
aE?qH8t69WX8{67qaP&g>$w-t%rMt8NAFg=-

literal 1936
zcmV;B2XFX&X{a{QUWJIs3$v|xOVdMa+kIOmgYJQuvSQ~ojAIzj37#PHs<@9PLM%w+
zaz^lO()$#c%@H>n2WmNjG@`xnQz{Ysm@i5}RxuX^Y?xlZ?8{xGPgl`0FX_hV|1C&C
z4OBHewJj?sL49egGh?|&j6MMTfaa+QLbMl>AQxFx1=kmQ81=A%%u8|(H!s~UF+p;E
zPtm=A(qK}x4hQE!Y9|F#Dl&AnTWjMcm8Lm(0PSLX+tX={R(K90!<5~faBuLmj*79X
z;r(>n0oWASD@O1G-ub(ZN7eG4Z^=3x34H6~BdWZ5l~a!B4!?>q5s&M8>M(h7u-k0e
zP48x!rVoJ;Lqv*{8z|bt)`%3fX{;Z^j`&v~k({^mTZLK!)0W01(wR+s<N*X%muQ1!
z@sW@p8Nu@|CYH9TJ<aF`ldTLaMrhdO6$pd{F3$(gyhcOTt5xDlbu&=wJ3hCm(n8SM
zwmo_)x9H#pC}!63>(!#cf-ciko~x8x;iaF)OPv6;+Ub`lwzlQK(H5eJp<P+_de9-r
zDb*hU4M6#?g&Kb0XD4OC>+`{^<fouW;Z}qnEAlpczt!CuKZb)$*({rYKf{^&orLMU
zs?L7lSEx>(6B?;;@<kV(8<t?SHY%Ia$gUcGR^>gV5==vJ-#16cF$?cCT#GK<ha0Du
z!%bkUDAlRWJ~H%mbM=UzPEv<zaLQhJBINgYeU&X&Uu0CdD{8Hoj@ijrLIm>WN3slO
z=y`oyuycH)5C+OJwYPG8JicP61d%a5`!_r1!w9~n_BFe%=nriv+0<Fv@`bv<-X^C^
znI<@$R!qsgkin%aI8&zVrukE8v(6J}<#kULUq&34#^OZBuZy42G<$olx}1+)4ox&2
zA0y|wE5t<mclgaxghR|v_$!rBVky9A{IQ3)bG9-1YR6AU#94~VKF>Latt1by5V-AS
z1s3?XwO)o`5D!Xh@i=wkQg+tRq)q55W65qg0>5H??hh<dsH&4bM63r#tTYZ(YoD|K
zMe&~*I`swZu@O;073}jbx*|F%(XrlJ7Ghwamm{yuxDU#FiE}03nFg<Np?;c>mbpPm
zLg)pL8ait;%qme175R)I)^*ePK`m2>jqKxS<iY;P8+;EXAZL$$UwM3`Yx<1(TpPeG
z0Q4r@m<Jp8h|?47!F0~}IBB&x#~ZK&%SoAw;Ozedv1S|q1uJnT>Hm!8rQ4a3scH30
z22|c<20lX9z3gvF#8+RCEzz?$e@{T&PJvET0^QFML4VmVb)I_oMpSj>w}LU=y8#O~
zw#;3)pc=npat1=`r-k;LFc8ROY<m>?purjPixv7-Z`c?|q!G)nJ=Hf-3n$pp=7AvW
zXje&b*C~HcukN6EyM~jfPgGgmX=Dmq=I~GDFX1kWtpRA>3}(v`|F)-9)N9m1U5?Fc
z=IAbC0Y;{SPj%F(dTZ1R_1#WCnTGp;PCQ0-r14+Qi=uvv!v0EDKF2e@^Q!?60!OLx
zJvp0<X05rGaF^7sis-M*KGv|uFN5K2@K(p@v)D6~n;ZFEjbD6<Xr7b{Yn_wZ@kn^w
zu%aDZ*QK>Y(bivi>ObdO{c6?S9u}XrVSuY=p!5nR-qa<d!a6lTvqb_JwPK<J;?4`u
z)<7|Gf<c)I<~9pSXxCe8MPS2^?E9-LTI+F1T50kJt63FB-~(?J(lRz(rKwURqK6X#
zsIcN(ln^6gPObDQXh)DZ6taT@+M|A*MXEc^+Ob0F;Ba3PHohYt+F?0G2Id{s7l6>r
z^xNe(=;P)|=b^)gFIVDKIi>A$0zlR(Tiq^YNl-%3X0?P(H$7`s)q5ZhaB-U8X(5HA
zih)Q`^GTqQ4WGvt9<VfZT98)vtVNcn=b-X~O=rs4+Nfd~)Bf|)F4D?wSLl0(Yu-1C
zMD@tG!dA@*AUrv}wKVQ9I&h;f-S}c%nbF7ifR1ED(zTRN6t$a!lskvtZxT_JxFN<C
zRK;$CLTP8`N=AV;eSYX<7x$5N47M_5Ht?E1^Xq|ZQu++n(~YUj*61MspRHv-AS%Pc
zmf#$mHH2W9>05A-h`9Ck{iM&Qvz7_#=wo0Hym7@EN~pJlP<*)M3XFRV3?nM>YVu>c
zGqbuI5_6D2(_F*$Cz3w5PGqkOJ;R{F7p~K578Y6-fyKtx0f^TSZQP)hxcm}LtSv!@
zL?<2B&>Iwj$C3&?;eQvI)Yo{?&a<`W2ha<e`5q^=2vo6WH2cc$@u|~t_A7i~I5zRd
z!L-8UD}5hpNjeEVBHRT&H%h;6v<*#FPMuFHxUa@`g6SSVyOr)IvziV%%RP;dYRtC~
z9alD@9OC-|Ur+D7JU<{GBJc_|Gg-`pWUe!^+xcJ~JP#?I{^!VDJwW5R5Wvg?0>cAV
z_!|!BS;sTI-WylXbnM*70Xet=Qvv4_s+0Dg2Db)o>5{kqqO6@sdZgH8emyJ?`>RvF
zO3d$5^~ZBK2Gz4+tP0%2e^;2E<0QByu{;58epkxBSjQ$UwgSH&W4AyW&|m0Xoi=9I
Wns6`Zouzp4pUeTxP*Dm>JG}|msl)03

diff --git a/.travis.yml b/.travis.yml
index 164ebb0..e3a8761 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,5 +13,7 @@ script:
 - yarn lint
 - yarn test
 before_install:
+- openssl aes-256-cbc -K $encrypted_eeb74e8d35d1_key -iv $encrypted_eeb74e8d35d1_iv
+  -in .env.enc -out .env -d
 - openssl aes-256-cbc -K $encrypted_fb307c69bf51_key -iv $encrypted_fb307c69bf51_iv
   -in .env.enc -out .env -d
diff --git a/scripts/encrypt.sh b/scripts/encrypt.sh
index 509b2c1..932f43f 100644
--- a/scripts/encrypt.sh
+++ b/scripts/encrypt.sh
@@ -1,18 +1,14 @@
 #!/bin/bash
 echo "Encrypting .env file for Travis..."
-if hash travis 2>/dev/null; then
-	if [ ! -f .env ]; then
-		echo "============================================================================================"
-		echo "ERROR: You must create a .env file and add your credentials. See .env.example for an example"
-		echo "============================================================================================"
-		exit 3
-	else
-		travis encrypt-file .env --add --force --org
-		git add .env.enc
-		git add .travis.yml
-		echo ".env.enc created and added to commit"
-	fi
-else
+
+# confirm that user has access to forensic architecture datasheet
+# if [ ! -z "$(travis repos | grep "forensic-architecture/datasheet-server")" ]
+# 	echo "No travis encrypt possible, skipping this step."
+# 	exit 0
+# fi
+
+# confirm travis is installed
+if [ ! hash travis 2>/dev/null ]; then
 	echo "============================================================================================"
 	echo "ERROR: Travis CLI is not installed on your local. Please install from:"
 	echo "\thttps://github.com/travis-ci/travis.rb"
@@ -21,3 +17,16 @@ else
 	echo "============================================================================================"
 	exit 3
 fi
+
+# confirm there is a .env file to encrypt
+if [ ! -f .env ]; then
+	echo "============================================================================================"
+	echo "ERROR: You must create a .env file and add your credentials. See .env.example for an example"
+	echo "============================================================================================"
+	exit 3
+fi
+
+travis encrypt-file .env --add --force --org
+git add .env.enc
+git add .travis.yml
+echo ".env.enc created and added to commit"