From abfea9226abea857f582c21210806364c1c0270e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 3 Nov 2017 18:43:20 -0200
Subject: [PATCH] ?

---
 android/app/build.gradle | 12 +++++++-----
 circle.yml               |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5149e4fe7..a256a2800 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -105,11 +105,13 @@ android {
     }
     signingConfigs {
         release {
-            storeFile file(System.getenv("KEYSTORE"))
-            storePassword System.getenv("KEYSTORE_PASSWORD")
-            keyAlias System.getenv("KEY_ALIAS")
-            keyPassword System.getenv("KEY_PASSWORD")
-        }
+					if (project.hasProperty('KEYSTORE')) {
+	            storeFile file(KEYSTORE)
+	            storePassword KEYSTORE_PASSWORD
+	            keyAlias KEY_ALIAS
+	            keyPassword KEY_PASSWORD
+	        }
+				}
     }
     splits {
         abi {
diff --git a/circle.yml b/circle.yml
index 7c053bb36..361f85172 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,8 +10,8 @@ dependencies:
   pre:
     # Install YARN
     - node -v
-    - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "./android/app/$KEYSTORE"
-    - echo -e "KEYSTORE=$KEYSTORE" > ./android/gradle.properties
+    - echo $KEYSTORE_BASE64 | base64 --decode > ./android/app/rocketchat-rn.keystore
+    - echo -e "KEYSTORE=$KEYSTORE" >> ./android/gradle.properties
     - echo -e "KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties
     - echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./android/gradle.properties
     - echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties