Skip to content

Commit 41f26bb

Browse files
committed
update.sh: fix to work with all shells and gopherjs 1.10-3.
Fixes gopherjs#69
1 parent cbdec89 commit 41f26bb

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

Diff for: playground/update.sh

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cleanup() {
88
exit
99
}
1010

11-
trap cleanup EXIT SIGHUP SIGINT SIGTERM
11+
trap cleanup EXIT HUP INT TERM
1212

1313
go install github.com/gopherjs/gopherjs/...
1414

@@ -20,18 +20,15 @@ gopherjs build -m
2020
# The GOPATH workspace where the GopherJS project is.
2121
gopherjsgopath=$(go list -f '{{.Root}}' github.com/gopherjs/gopherjs)
2222

23-
rm -r pkg/
23+
rm -rf pkg/
2424

2525
# Use an empty GOPATH workspace with just gopherjs,
2626
# so that all the standard library packages get written to GOROOT/pkg.
2727
export GOPATH="$tmp/gopath"
2828
mkdir -p "$GOPATH"/src/github.com/gopherjs/gopherjs
2929
cp -a "$gopherjsgopath"/src/github.com/gopherjs/gopherjs/* "$GOPATH"/src/github.com/gopherjs/gopherjs
3030

31-
gopherjs install -m github.com/gopherjs/gopherjs/js github.com/gopherjs/gopherjs/nosync
32-
mkdir -p pkg/github.com/gopherjs/gopherjs
33-
cp "$GOPATH"/pkg/*_js_min/github.com/gopherjs/gopherjs/js.a pkg/github.com/gopherjs/gopherjs/js.a
34-
cp "$GOPATH"/pkg/*_js_min/github.com/gopherjs/gopherjs/nosync.a pkg/github.com/gopherjs/gopherjs/nosync.a
31+
mkdir pkg
3532

3633
# Make a copy of GOROOT that is user-writeable,
3734
# use it to build and copy out standard library packages.

0 commit comments

Comments
 (0)