update dependencies and compiler

arguablykomodo · Jan 23, 2019 · 96c088f · 96c088f
1 parent b8bb580
commit 96c088f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,7 @@ language: go
 go: "1.11"
 
 script:
-  - cd compiler
   - go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
-  - cd ..
   - go run compiler/main.go $(git describe)
 
 deploy:

diff --git a/compiler/compiler b/compiler/compiler
diff --git a/compiler/go.mod b/compiler/go.mod
diff --git a/compiler/go.sum b/compiler/go.sum
diff --git a/compiler/main.go b/compiler/main.go
@@ -24,9 +24,7 @@ func writeManifest() {
 	}
 
 	manifest, err := ioutil.ReadFile("_manifest.xml")
-	if err != nil {
-		panic(err)
-	}
+	checkErr(err)
 
 	err = ioutil.WriteFile(
 		"manifest.xml",
@@ -41,9 +39,7 @@ func writeManifest() {
 		),
 		0644,
 	)
-	if err != nil {
-		panic(err)
-	}
+	checkErr(err)
 }
 
 func main() {
@@ -63,7 +59,6 @@ func main() {
 	writeManifest()
 
 	// Generate .syso files
-	fmt.Printf("Generating .syso files\n")
 	sysoArgs := []string{
 		"-platform-specific=true",
 		"-ver-major=" + major,
@@ -75,7 +70,9 @@ func main() {
 		"-product-ver-patch=" + patch,
 		"-product-ver-build=0",
 	}
-	err = exec.Command("goversioninfo", sysoArgs...).Run()
+	fmt.Println("goversioninfo " + strings.Join(sysoArgs, " "))
+	output, err := exec.Command("goversioninfo", sysoArgs...).Output()
+	fmt.Println(string(output))
 	checkErr(err)
 
 	for i, buildOS := range osList {
@@ -96,10 +93,9 @@ func main() {
 				args[4] += ".exe"
 			}
 
-			fmt.Printf("go %v\n", strings.Join(args, " "))
-
-			fmt.Printf("Compiling %v %v\n", buildOS, buildArch)
-			err = exec.Command("go", args...).Run()
+			fmt.Println("go " + strings.Join(args, " "))
+			output, err := exec.Command("go", args...).Output()
+			fmt.Println(string(output))
 			checkErr(err)
 		}
 	}

diff --git a/go.mod b/go.mod
@@ -1,9 +1,11 @@
 module github.com/SrKomodo/shadowfox-updater
 
 require (
+	github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd // indirect
 	github.com/gdamore/tcell v1.1.1
 	github.com/go-ini/ini v1.41.0
 	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
+	github.com/josephspurrier/goversioninfo v0.0.0-20190122232203-2e127a11672c // indirect
 	github.com/jtolds/gls v4.2.1+incompatible // indirect
 	github.com/mitchellh/go-homedir v1.0.0
 	github.com/rivo/tview v0.0.0-20190122192331-1ac6fbc0c239

diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd h1:yumR8733CaQ3P76MFbIbBKdrJmy4EqnQ5DIhqq8gq2Q=
+github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd/go.mod h1:2+aQMrY0hBFBaIr2xxnZ/ctfwnYmMRMbTczYLAC34v4=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell v1.1.1 h1:U73YL+jMem2XfhvaIUfPO6MpJawaG92B2funXVb9qLs=
@@ -6,6 +8,8 @@ github.com/go-ini/ini v1.41.0 h1:526aoxDtxRHFQKMZfcX2OG9oOI8TJ5yPLM0Mkno/uTY=
 github.com/go-ini/ini v1.41.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/josephspurrier/goversioninfo v0.0.0-20190122232203-2e127a11672c h1:T48SWrqbD1AAXY1ktt23P2diudMWOX4R+FID7Rqjhts=
+github.com/josephspurrier/goversioninfo v0.0.0-20190122232203-2e127a11672c/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
 github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY=