From 0d5dba5cd80094d632daacab7c23372a4f2f6e09 Mon Sep 17 00:00:00 2001
From: Matheus Fernandes <github@matheus.top>
Date: Tue, 5 Dec 2017 02:41:51 -0800
Subject: [PATCH] Fix branch detection when setting the canary icon (#2499)

* Fix branch detection

* Use the canary icon on Windows as well

* Add missing space

* `TRAVIS_BRANCH` will be `canary` when a PR targets such branch
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d3c8917d..cb6ccacf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,9 +33,10 @@ install:
   - yarn
 
 after_success:
-  - if [[ "$TRAVIS_BRANCH" == "canary" ]]; then cp build/canary.icns build/icon.icns; fi
+  - (git branch --contains $TRAVIS_COMMIT | grep canary > /dev/null || [[ "$TRAVIS_BRANCH" == "canary" ]] ) && (cd build; cp canary.icns icon.icns; cp canary.ico icon.ico)
   - yarn run dist
 
 branches:
   except:
     - "/^v\\d+\\.\\d+\\.\\d+$/"
+