all: minimize naked return on long functions

5 files changed, 27 insertions, 18 deletions

diff --git a/cmd/beku/command.go b/cmd/beku/command.go
index d0be5af..fce475d 100644
--- a/cmd/beku/command.go
+++ b/cmd/beku/command.go
@@ -273,7 +273,7 @@ func (cmd *command) parseLongFlags(arg string) (op operation, err error) {
 
 	cmd.op |= op
 
-	return
+	return op, nil
 }
 
 //
@@ -440,5 +440,5 @@ func newCommand() (cmd *command, err error) {
 		fmt.Printf("Environment: %s", cmd.env.String())
 	}
 
-	return
+	return cmd, err
 }
diff --git a/common.go b/common.go
index 9ebbdfd..fa49846 100644
--- a/common.go
+++ b/common.go
@@ -57,7 +57,7 @@ func GetCompareURL(remoteURL, oldVer, newVer string) (url string) {
 			repo, oldVer, newVer)
 	}
 
-	return
+	return url
 }
 
 //
@@ -133,5 +133,5 @@ func parsePkgVersion(pkgVersion string) (pkgName, version string) {
 		version = strings.TrimSpace(version)
 	}
 
-	return
+	return pkgName, version
 }
diff --git a/env.go b/env.go
index 6fc8fdf..f1f2fa1 100644
--- a/env.go
+++ b/env.go
@@ -88,8 +88,11 @@ func NewEnvironment(vendor, noDeps bool) (env *Env, err error) {
 	}
 
 	err = env.scanStdPackages(env.dirGoRootSrc)
+	if err != nil {
+		return nil, err
+	}
 
-	return
+	return env, nil
 }
 
 func (env *Env) initGopath() {
@@ -232,7 +235,7 @@ func (env *Env) Freeze() (err error) {
 out:
 	fmt.Println("[ENV] Freeze >>> finished")
 
-	return
+	return nil
 }
 
 //
@@ -349,7 +352,7 @@ func (env *Env) GetUnused(srcPath string) (err error) {
 		}
 	}
 
-	return
+	return nil
 }
 
 //
@@ -475,7 +478,7 @@ func (env *Env) scanPackages(srcPath string) (err error) {
 		}
 	}
 
-	return
+	return nil
 }
 
 //
@@ -726,7 +729,7 @@ func (env *Env) Rescan(firstTime bool) (ok bool, err error) {
 	}
 	env.dirty = true
 
-	return
+	return true, nil
 }
 
 //
@@ -804,7 +807,7 @@ This package is required by,
 		_ = libio.RmdirEmptyAll(pkgImportPath)
 	}
 
-	return
+	return nil
 }
 
 func (env *Env) filterUnusedDeps(pkg *Package, tobeRemoved map[string]bool) {
@@ -934,8 +937,11 @@ func (env *Env) Save(file string) (err error) {
 	env.savePackages()
 
 	err = env.db.Save(file)
+	if err != nil {
+		return err
+	}
 
-	return
+	return nil
 }
 
 func (env *Env) saveBeku() {
@@ -1093,7 +1099,7 @@ func (env *Env) update(curPkg, newPkg *Package) (ok bool, err error) {
 
 	env.dirty = true
 
-	return
+	return true, nil
 }
 
 //
@@ -1218,8 +1224,11 @@ func (env *Env) Sync(pkgName, importPath string) (err error) {
 	}
 
 	err = env.postSync(curPkg)
+	if err != nil {
+		return err
+	}
 
-	return
+	return nil
 }
 
 //
@@ -1317,7 +1326,7 @@ func (env *Env) SyncAll() (err error) {
 
 	fmt.Println("[ENV] SyncAll >>> Update completed.")
 
-	return
+	return nil
 }
 
 func (env *Env) postSync(pkg *Package) (err error) {
diff --git a/package.go b/package.go
index a5c1383..be58628 100644
--- a/package.go
+++ b/package.go
@@ -347,7 +347,7 @@ func (pkg *Package) GetRecursiveImports(env *Env) (
 
 	sort.Strings(imports)
 
-	return
+	return imports, nil
 }
 
 //
@@ -554,7 +554,7 @@ func (pkg *Package) Update(newPkg *Package) (err error) {
 	pkg.Version = newPkg.Version
 	pkg.isTag = IsTagVersion(newPkg.Version)
 
-	return
+	return nil
 }
 
 //
diff --git a/package_git.go b/package_git.go
index 67c5323..6e88fb6 100644
--- a/package_git.go
+++ b/package_git.go
@@ -80,7 +80,7 @@ func (pkg *Package) gitInstall() (err error) {
 		}
 	}
 
-	return
+	return nil
 }
 
 //
@@ -140,7 +140,7 @@ func (pkg *Package) gitGetBranch() (err error) {
 	if debug.Value >= 1 {
 		fmt.Printf("= gitGetBranch: %s\n", pkg.RemoteBranch)
 	}
-	return
+	return nil
 }
 
 //