From be3301d09b543c8e6a4d43b215f74baef399c357 Mon Sep 17 00:00:00 2001
From: marc <marc@cockroachlabs.com>
Date: Wed, 15 Jun 2016 12:15:29 -0400
Subject: [PATCH] Let go-bindata expand the directory listing rather than bash.

We ran into some oddness with glob expansion ordering, causing
`embedded.go` to have slightly different ordering, and failing in
circle-ci.

The simplest way to get around it is to let go-bindata expand the
directory.
---
 ui/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/Makefile b/ui/Makefile
index 2cc9a72e628f..4f7ceeb69179 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -47,8 +47,8 @@ CSS_TARGET              := build/app.css
 CSS_DEBUG_TARGET        := build/app_debug.css
 REMOTE_DEPS             := npm.installed bower.installed typings.installed
 INDEX                   := index.html
-GOBINDATA_FONTS         := ./fonts/*
-GOBINDATA_ASSETS        := ./assets/*
+GOBINDATA_FONTS         := ./fonts/
+GOBINDATA_ASSETS        := ./assets/
 GOBINDATA_DEPS          := $(TYPESCRIPT_TARGET) $(CSS_TARGET)
 GOBINDATA_DEBUG_DEPS    := $(TYPESCRIPT_TARGET) $(CSS_DEBUG_TARGET)
 GOBINDATA_SOURCES       := $(NODE_MODULES)/lodash/lodash.min.js \