Skip to content

Commit

Permalink
Use absolute path to webextension.go asset
Browse files Browse the repository at this point in the history
Bump to version 1.0.8
  • Loading branch information
tombh committed Jun 11, 2018
1 parent 47bcbbc commit c13e8d2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions interfacer/src/browsh/firefox.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ func firefoxMarionette() {
// Install the Browsh extension that was bundled with `go-bindata` under
// `webextension.go`.
func installWebextension() {
data, err := Asset("webext/dist/web-ext-artifacts/browsh.xpi")
data, err := Asset("/webext/dist/web-ext-artifacts/browsh.xpi")
if err != nil {
Shutdown(err)
}
file, err := ioutil.TempFile(os.TempDir(), "prefix")
file, err := ioutil.TempFile(os.TempDir(), "browsh-webext-addon")
defer os.Remove(file.Name())
ioutil.WriteFile(file.Name(), []byte(data), 0644)
args := map[string]interface{}{"path": file.Name()}
Expand Down
3 changes: 3 additions & 0 deletions interfacer/test/http-server/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ var _ = ginkgo.BeforeSuite(func() {
go startStaticFileServer()
go startBrowsh()
time.Sleep(10 * time.Second)
// Allow the browser to sort its sizing out, because sometimes the first test catches the
// browser before it's completed its resizing.
getPath("/smorgasbord")
})

var _ = ginkgo.AfterSuite(func() {
Expand Down
6 changes: 5 additions & 1 deletion webext/contrib/bundle_webextension.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,15 @@ fi

cp -f $source_file $bundle_file

echo "Bundling $source_file to $destination..."
echo "Bundling $source_file to $destination using internal path $bundle_file"

go-bindata -version
go-bindata \
-nocompress \
-prefix $PROJECT_ROOT \
-pkg browsh \
-o $destination \
$bundle_file

ls -alh $PROJECT_ROOT/interfacer/src/browsh/webextension.go
echo "go-bindata exited with $(echo $?)"
2 changes: 1 addition & 1 deletion webext/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Browsh",
"version": "1.0.5",
"version": "1.0.8",

"description": "Renders the browser as realtime, interactive, TTY-compatible text",

Expand Down

0 comments on commit c13e8d2

Please sign in to comment.