From b1efabaaeda8aa26bc63acfe613c2a20dc58665e Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Fri, 27 Dec 2019 00:43:45 -0500 Subject: [PATCH 1/2] Command binding fix --- internal/action/bufpane.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/action/bufpane.go b/internal/action/bufpane.go index 5941a509..02b19e36 100644 --- a/internal/action/bufpane.go +++ b/internal/action/bufpane.go @@ -62,6 +62,8 @@ func BufMapKey(k Event, action string) { break } + // TODO: fix problem when complex bindings have these + // characters (escape them?) idx := strings.IndexAny(action, "&|,") a := action if idx >= 0 { @@ -74,7 +76,7 @@ func BufMapKey(k Event, action string) { } var afn func(*BufPane) bool - if strings.HasPrefix(action, "command:") { + if strings.HasPrefix(a, "command:") { a = strings.SplitN(a, ":", 2)[1] afn = CommandAction(a) names = append(names, "") @@ -86,7 +88,7 @@ func BufMapKey(k Event, action string) { a = strings.SplitN(a, ":", 2)[1] afn = LuaAction(a) if afn == nil { - screen.TermMessage("Lua Error:", action, "does not exist") + screen.TermMessage("Lua Error:", a, "does not exist") continue } names = append(names, "") @@ -94,7 +96,7 @@ func BufMapKey(k Event, action string) { afn = f names = append(names, a) } else { - screen.TermMessage("Error:", action, "does not exist") + screen.TermMessage("Error:", a, "does not exist") continue } actionfns = append(actionfns, afn) From 5fba432d7887c0b607b8c444a88e64ca98d8e8e1 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Fri, 27 Dec 2019 17:26:03 +0000 Subject: [PATCH 2/2] Use makefile to build for cross compilation --- tools/cross-compile.sh | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh index ad80af89..e80773c9 100755 --- a/tools/cross-compile.sh +++ b/tools/cross-compile.sh @@ -14,55 +14,66 @@ ADDITIONAL_GO_LINKER_FLAGS="$(go run tools/info-plist.go $VERSION)" # Mac echo "OSX 64" -GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE' $ADDITIONAL_GO_LINKER_FLAGS" -o micro-$1/micro ./cmd/micro +GOOS=darwin GOARCH=amd64 make build +mv micro micro-$1 tar -czf micro-$1-osx.tar.gz micro-$1 mv micro-$1-osx.tar.gz binaries # Linux echo "Linux 64" -GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=linux GOARCH=amd64 make build +mv micro micro-$1 tar -czf micro-$1-linux64.tar.gz micro-$1 mv micro-$1-linux64.tar.gz binaries echo "Linux 32" -GOOS=linux GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=linux GOARCH=386 make build +mv micro micro-$1 tar -czf micro-$1-linux32.tar.gz micro-$1 mv micro-$1-linux32.tar.gz binaries echo "Linux ARM 32" -GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=linux GOARCH=arm make build +mv micro micro-$1 tar -czf micro-$1-linux-arm.tar.gz micro-$1 mv micro-$1-linux-arm.tar.gz binaries echo "Linux ARM 64" -GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=linux GOARCH=arm64 make build +mv micro micro-$1 tar -czf micro-$1-linux-arm64.tar.gz micro-$1 mv micro-$1-linux-arm64.tar.gz binaries # NetBSD echo "NetBSD 64" -GOOS=netbsd GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=netbsd GOARCH=amd64 make build +mv micro micro-$1 tar -czf micro-$1-netbsd64.tar.gz micro-$1 mv micro-$1-netbsd64.tar.gz binaries echo "NetBSD 32" -GOOS=netbsd GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=netbsd GOARCH=386 make build +mv micro micro-$1 tar -czf micro-$1-netbsd32.tar.gz micro-$1 mv micro-$1-netbsd32.tar.gz binaries # OpenBSD echo "OpenBSD 64" -GOOS=openbsd GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=openbsd GOARCH=amd64 make build +mv micro micro-$1 tar -czf micro-$1-openbsd64.tar.gz micro-$1 mv micro-$1-openbsd64.tar.gz binaries echo "OpenBSD 32" -GOOS=openbsd GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=openbsd GOARCH=386 make build +mv micro micro-$1 tar -czf micro-$1-openbsd32.tar.gz micro-$1 mv micro-$1-openbsd32.tar.gz binaries # FreeBSD echo "FreeBSD 64" -GOOS=freebsd GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=freebsd GOARCH=amd64 make build +mv micro micro-$1 tar -czf micro-$1-freebsd64.tar.gz micro-$1 mv micro-$1-freebsd64.tar.gz binaries echo "FreeBSD 32" -GOOS=freebsd GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +GOOS=freebsd GOARCH=386 make build +mv micro micro-$1 tar -czf micro-$1-freebsd32.tar.gz micro-$1 mv micro-$1-freebsd32.tar.gz binaries @@ -70,11 +81,13 @@ rm micro-$1/micro # Windows echo "Windows 64" -GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro.exe ./cmd/micro +GOOS=windows GOARCH=amd64 make build +mv micro micro-$1 zip -r -q -T micro-$1-win64.zip micro-$1 mv micro-$1-win64.zip binaries echo "Windows 32" -GOOS=windows GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro.exe ./cmd/micro +GOOS=windows GOARCH=386 make build +mv micro micro-$1 zip -r -q -T micro-$1-win32.zip micro-$1 mv micro-$1-win32.zip binaries