Merge pull request #57 from mnottale/extract-cosmetic

mnottale · web-flow · commit b338369ce588 · 2018-04-27T17:53:52.000+02:00
extract: cosmetic changes.
diff --git a/packager/extract.go b/packager/extract.go
@@ -52,8 +52,7 @@ func findApp() (string, error) {
 func Extract(appname string) (string, func(), error) {
 	if appname == "" {
 		var err error
-		appname, err = findApp()
-		if err != nil {
+		if appname, err = findApp(); err != nil {
 			return "", nil, err
 		}
 	}
@@ -76,8 +75,7 @@ func Extract(appname string) (string, func(), error) {
 	if err != nil {
 		return "", noop, err
 	}
-	err = extract(appname, tempDir)
-	if err != nil {
+	if err = extract(appname, tempDir); err != nil {
 		return "", noop, err
 	}
 	return tempDir, func() { os.RemoveAll(tempDir) }, nil

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ func findApp() (string, error) {`
`52`	`52`	`func Extract(appname string) (string, func(), error) {`
`53`	`53`	`if appname == "" {`
`54`	`54`	`var err error`
`55`		`- appname, err = findApp()`
`56`		`- if err != nil {`
	`55`	`+ if appname, err = findApp(); err != nil {`
`57`	`56`	`return "", nil, err`
`58`	`57`	`}`
`59`	`58`	`}`
`@@ -76,8 +75,7 @@ func Extract(appname string) (string, func(), error) {`
`76`	`75`	`if err != nil {`
`77`	`76`	`return "", noop, err`
`78`	`77`	`}`
`79`		`- err = extract(appname, tempDir)`
`80`		`- if err != nil {`
	`78`	`+ if err = extract(appname, tempDir); err != nil {`
`81`	`79`	`return "", noop, err`
`82`	`80`	`}`
`83`	`81`	`return tempDir, func() { os.RemoveAll(tempDir) }, nil`