From ad8d45ec8d171a3722f59d3a93ca305048d263a5 Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Fri, 19 Jan 2018 11:26:17 -0500
Subject: [PATCH] Fix brunch config

Also remove those lines from the Codeship setup file. I don't like them!
---
 assets/brunch-config.js |  4 ++--
 bin/codeship_setup      | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/assets/brunch-config.js b/assets/brunch-config.js
index c935451..a971cf5 100644
--- a/assets/brunch-config.js
+++ b/assets/brunch-config.js
@@ -3,8 +3,8 @@ exports.config = {
   files: {
     javascripts: {
       joinTo: {
-        "js/app.js": /^(web\/static\/js\/)/,
-        "js/vendor.js": /(node_modules)|^(web\/static\/vendor)|(deps)/
+        "js/app.js": /^js/,
+        "js/vendor.js": /^(?!js)/
       }
     },
     stylesheets: {
diff --git a/bin/codeship_setup b/bin/codeship_setup
index 455fb5d..1d7cd56 100755
--- a/bin/codeship_setup
+++ b/bin/codeship_setup
@@ -1,28 +1,18 @@
 #!/usr/bin/env bash
 
-echo "================="
 echo "Installing Erlang"
-echo "-----------------"
 source /dev/stdin <<< "$(curl -sSL https://raw.githubusercontent.com/codeship/scripts/master/languages/erlang.sh)"
 
-echo "================="
 echo "Installing Elixir"
-echo "-----------------"
 source /dev/stdin <<< "$(curl -sSL https://raw.githubusercontent.com/codeship/scripts/master/languages/elixir.sh)"
 
-echo "===================="
 echo "Installing PhantomJS"
-echo "--------------------"
 curl -sSL https://raw.githubusercontent.com/codeship/scripts/master/packages/phantomjs.sh | bash -s
 
-echo "================="
 echo "Installing NodeJS"
-echo "-----------------"
 nvm install $NODE_VERSION
 
-echo "==============================="
 echo "Installing Phoenix dependencies"
-echo "-------------------------------"
 mix local.hex --force
 mix local.rebar --force
 
@@ -30,20 +20,14 @@ export MIX_ENV=test
 mix deps.get
 mix deps.compile
 
-echo "==============================="
 echo "Creating and migrating database"
-echo "-------------------------------"
 mix ecto.create
 mix ecto.migrate
 
-echo "================="
 echo "Running PhantomJS"
-echo "-----------------"
 phantomjs --webdriver=0.0.0.0:8910 2>/dev/null &
 
-echo "====================="
 echo "Installing NPM assets"
-echo "---------------------"
 cd assets
 npm install
 cd ..