From c61bd8e8653025b5b045d453fa3e33c2b8e71652 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Wed, 26 Apr 2017 01:15:41 +0800
Subject: [PATCH] fixed travis config

---
 .travis.yml                              | 4 ++--
 travis/scripts/decode_private_configs.sh | 7 +++++++
 travis/scripts/fetch_private_files.sh    | 4 ++--
 travis/scripts/test_private_files.sh     | 4 ++--
 travis/scripts/upload_error_logs.sh      | 4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100755 travis/scripts/decode_private_configs.sh

diff --git a/.travis.yml b/.travis.yml
index 39bdde961..b38b2d68f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ cache:
     - $HOME/.m2/
 
 before_install:
-  - openssl aes-256-cbc -K $encrypted_9b8203f9524d_key -iv $encrypted_9b8203f9524d_iv -in travis/configs/twidere_private_config.tar.gz.enc -out travis/configs/twidere_private_config.tar.gz -d
+  - ./travis/scripts/decode_private_configs.sh
 
 install:
   - ./travis/scripts/fetch_private_files.sh
@@ -78,4 +78,4 @@ deploy:
     script: ./gradlew publishGoogleRelease
     on:
       repo: TwidereProject/Twidere-Android
-      tags: true
\ No newline at end of file
+      tags: true
diff --git a/travis/scripts/decode_private_configs.sh b/travis/scripts/decode_private_configs.sh
new file mode 100755
index 000000000..89c90cfd4
--- /dev/null
+++ b/travis/scripts/decode_private_configs.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    exit 0
+fi
+
+openssl aes-256-cbc -K $encrypted_9b8203f9524d_key -iv $encrypted_9b8203f9524d_iv -in travis/configs/twidere_private_config.tar.gz.enc -out travis/configs/twidere_private_config.tar.gz -d
diff --git a/travis/scripts/fetch_private_files.sh b/travis/scripts/fetch_private_files.sh
index 099fa99ea..84bc6c8df 100755
--- a/travis/scripts/fetch_private_files.sh
+++ b/travis/scripts/fetch_private_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-      return 0
+      exit 0
 fi
 
 # Extracts build configs into source tree
@@ -19,4 +19,4 @@ ssh-agent bash -c "ssh-add private/ssh_id_rsa; git clone $COMPONENT_GOOGLE_REPO
 # Force reset to required commit id
 git -C twidere/src/google reset --hard `cat twidere/src/.google.commit-id` > /dev/null 2>&1
 # Dropbox accessToken for uploading logs
-cat private/dropbox_uploader >> ~/.dropbox_uploader
\ No newline at end of file
+cat private/dropbox_uploader >> ~/.dropbox_uploader
diff --git a/travis/scripts/test_private_files.sh b/travis/scripts/test_private_files.sh
index eb02de5f9..14b7d2ec0 100755
--- a/travis/scripts/test_private_files.sh
+++ b/travis/scripts/test_private_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-    return 0
+    exit 0
 fi
 
-test -f twidere/src/google/AndroidManifest.xml
\ No newline at end of file
+test -f twidere/src/google/AndroidManifest.xml
diff --git a/travis/scripts/upload_error_logs.sh b/travis/scripts/upload_error_logs.sh
index 65fe07cc6..35ad87c39 100755
--- a/travis/scripts/upload_error_logs.sh
+++ b/travis/scripts/upload_error_logs.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-      return 0
+      exit 0
 fi
 
 curl 'https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh' -o travis/scripts/dropbox_uploader.sh
 chmod +x travis/scripts/dropbox_uploader.sh
 find /tmp -maxdepth 1 -name 'kotlin-daemon.*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/$(basename $1)' find-sh {} \;
 find ~/.gradle/daemon/ -name 'daemon-*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/gradle-$(basename $1)' find-sh {} \;
-dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log ${TRAVIS_BUILD_ID}/dmesg.log
\ No newline at end of file
+dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log ${TRAVIS_BUILD_ID}/dmesg.log