From 1a9c01287c3921f10a6037d50fe2f08a2ae30d09 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 21 Jan 2016 12:05:53 -0500
Subject: Fixing travis

---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index eb25f40f2..6551f6d07 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ dist: | build-server build-client go-test package
 dist-local: | start-docker dist
 
 dist-travis: | travis-init build-container
+	mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json;
 
 start-docker:
 	@echo Starting docker containers
@@ -147,10 +148,6 @@ package:
 	sed -i'.bak' 's|libs.min.js|libs-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html
 	rm $(DIST_PATH)/web/templates/*.bak
 
-	if [ "$(TRAVIS_DB)" != "" ]; then \
-		mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json; \
-	fi
-
 	tar -C dist -czf $(DIST_PATH).tar.gz mattermost
 
 build-client:
-- 
cgit v1.2.3-1-g7c22