Fix info-plist script

diff --git a/Makefile b/Makefile
index 0034173a828c17ed6f2b7a98d258f0105354e468..fc9601aa5c4de5d24a00a15d6c7e643deac6c77d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
        go run tools/build-date.go)
 ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
        GOARCH=$(shell go env GOHOSTARCH) \
-       go run tools/info-plist.go "$(GOOS)" "$(VERSION)")
+       go run tools/info-plist.go "$(shell go env GOOS)" "$(VERSION)")
 GOBIN ?= $(shell go env GOPATH)/bin
 GOVARS = -X github.com/zyedidia/micro/v2/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/v2/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/v2/internal/util.CompileDate=$(DATE)'
 DEBUGVAR = -X github.com/zyedidia/micro/v2/internal/util.Debug=ON

diff --git a/tools/info-plist.go b/tools/info-plist.go
index d57a7b2479b4b30a6aba87a8698e71b7094bc392..22a1db0ef78afe83ea3393469ef1772ba4b673d8 100644 (file)
--- a/tools/info-plist.go
+++ b/tools/info-plist.go
@@ -7,6 +7,7 @@ import (
        "fmt"
        "io/ioutil"
        "os"
+       "runtime"
 )
 
 func check(e error) {
@@ -17,7 +18,7 @@ func check(e error) {
 
 func main() {
        if len(os.Args) == 3 {
-               if os.Args[1] == "darwin" {
+               if os.Args[1] == "darwin" && runtime.GOOS == "darwin" {
                        rawInfoPlistString := `<?xml version="1.0" encoding="UTF-8"?>
        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
        <plist version="1.0">