From d0863d495c669d888570f6096ef2f77f8ddffb48 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 23 Feb 2014 13:54:23 +0100 Subject: [PATCH] Use simple script for asset embedding --- assets.sh | 27 + auto/gui.files.go | 12944 +++++++++++++++++++++++++++++++++++++++++++- build.sh | 4 +- gui_embedded.go | 8 +- 4 files changed, 12970 insertions(+), 13 deletions(-) create mode 100755 assets.sh diff --git a/assets.sh b/assets.sh new file mode 100755 index 00000000..ef07efa3 --- /dev/null +++ b/assets.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +cat < auto/gui.files.go go get -d go test ./... fi if [[ -z $1 ]] ; then go build -ldflags "-X main.Version $version" -elif [[ $1 == "embed" ]] ; then - embedder auto gui > auto/gui.files.go \ - && go build -ldflags "-X main.Version $version" elif [[ $1 == "tar" ]] ; then go build -ldflags "-X main.Version $version" \ && mkdir syncthing-dist \ diff --git a/gui_embedded.go b/gui_embedded.go index f208445f..04cc5af8 100644 --- a/gui_embedded.go +++ b/gui_embedded.go @@ -11,15 +11,9 @@ import ( "time" "github.com/calmh/syncthing/auto" - "github.com/cratonica/embed" ) func embeddedStatic() interface{} { - fs, err := embed.Unpack(auto.Resources) - if err != nil { - panic(err) - } - var modt = time.Now().UTC().Format(http.TimeFormat) return func(res http.ResponseWriter, req *http.Request, log *log.Logger) { @@ -29,7 +23,7 @@ func embeddedStatic() interface{} { file = file[1:] } - bs, ok := fs[file] + bs, ok := auto.Assets[file] if !ok { return }