From 6a65618e82cbb889069b1de1a4777a99fbad90e0 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Fri, 18 Aug 2017 18:05:51 +0200
Subject: [PATCH] Set branch name to travis_branch + create folders on the fly
 (#1480)

---
 .travis.yml     | 4 ++--
 bin/install.php | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4cc2a2292..8fe2c9a4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ before_install:
     - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose
     - chmod +x docker-compose
     - sudo mv docker-compose /usr/local/bin
-    - date=`date +%Y%m%d%H%M%S` && branch=`git rev-parse --abbrev-ref HEAD` && rev=`git rev-parse --short=6 HEAD` && sed -i "s/\$1/\$1.$date.$branch.$rev/g" deployment.json
+    - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` && sed -i "s/\$1/\$1.$date.$branch.$rev/g" deployment.json
 script:
     - docker run --rm -v $(pwd):/app composer/composer install
-    - sudo php bin/install.php translations develop
+    - php bin/install.php translations develop
     - docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt sh -c "npm install && bower install && grunt package"
     - docker-compose build
 env:
diff --git a/bin/install.php b/bin/install.php
index 66bab773c..0562db67a 100755
--- a/bin/install.php
+++ b/bin/install.php
@@ -255,6 +255,11 @@ class Installer
             if ($file->isDir()) {
                 @mkdir($dst . '/' . $iterator->getSubPathName());
             } else {
+                if (!is_dir($dst)) 
+                {
+                    @mkdir($dst);
+                }
+
                 $success = copy($file, $dst . '/' . $iterator->getSubPathName());
                 if ($success) {
                     echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;