From a985a723a1ac44a1ac20df573b8e674a61d8d143 Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Wed, 20 Mar 2013 12:31:42 +0100 Subject: [PATCH] Remove echo -e because it's not available on Travis. Instead, files.go gets piped through gofmt. --- Makefile | 2 +- utility/embed-static.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 79f8ea1da..b2f9b6cc7 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ test: build go test ./... build: - ./utility/embed-static.sh web/static web/templates > web/blob/files.go + ./utility/embed-static.sh web/static web/templates | gofmt > web/blob/files.go cat web/blob/files.go $(MAKE) -C model go build ./... diff --git a/utility/embed-static.sh b/utility/embed-static.sh index 1942e324d..522610a01 100755 --- a/utility/embed-static.sh +++ b/utility/embed-static.sh @@ -10,17 +10,17 @@ CDIR=`pwd` for dir in $@ do cd "$dir" - echo -e "\t\"`basename $dir`\": {" + echo "\"`basename $dir`\": {" find -type f | while read file do name=`echo "$file"|sed 's|\.\/||'` - echo -e "\t\t\"$name\": {" + echo "\"$name\": {" gzip -9 -c "$file" | xxd -p |sed 's/\(..\)/0x\1, /g' - echo -e "\t\t}," + echo "}," echo done - echo -e "\t}," + echo "}," cd $CDIR done echo '}'