Merge branch 'master' into master

lpar · web-flow · commit c013d147360e · 2019-02-16T13:19:06.000-06:00
diff --git a/main.go b/main.go
@@ -277,9 +277,9 @@ func fixPermissions(root string) error {
 func downloadAndInstall(dl *GoDownload) error {
 	tmpfile, shasum, err := downloadFile(dl)
 	if err != nil {
-		return fmt.Errorf("tmpfile download failed: %v", err)
+		return fmt.Errorf("temporary file download failed: %v", err)
 	}
-	fmt.Printf("tmpfile downloaded successfully into %v\n", tmpfile)
+	fmt.Printf("Temporary file downloaded successfully into %v\n", tmpfile)
 	if shasum != dl.SHA256 {
 		return fmt.Errorf("bad checksum, expected %s got %s", dl.SHA256, shasum)
 	}

Original file line number	Diff line number	Diff line change
`@@ -277,9 +277,9 @@ func fixPermissions(root string) error {`
`277`	`277`	`func downloadAndInstall(dl *GoDownload) error {`
`278`	`278`	`tmpfile, shasum, err := downloadFile(dl)`
`279`	`279`	`if err != nil {`
`280`		`- return fmt.Errorf("tmpfile download failed: %v", err)`
	`280`	`+ return fmt.Errorf("temporary file download failed: %v", err)`
`281`	`281`	`}`
`282`		`- fmt.Printf("tmpfile downloaded successfully into %v\n", tmpfile)`
	`282`	`+ fmt.Printf("Temporary file downloaded successfully into %v\n", tmpfile)`
`283`	`283`	`if shasum != dl.SHA256 {`
`284`	`284`	`return fmt.Errorf("bad checksum, expected %s got %s", dl.SHA256, shasum)`
`285`	`285`	`}`