From 1cfdd1283a91c628b883bdae75e48619db7175e1 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sat, 26 Oct 2019 01:48:19 -0700
Subject: [PATCH] cmd/import: improve error message

- Print app.Run() error
---
 gogs.go                | 7 +++++--
 internal/cmd/import.go | 9 +++++----
 templates/.VERSION     | 2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gogs.go b/gogs.go
index ae90e4993..a0a140c37 100644
--- a/gogs.go
+++ b/gogs.go
@@ -11,12 +11,13 @@ import (
 	"os"
 
 	"github.com/urfave/cli"
+	log "gopkg.in/clog.v1"
 
 	"gogs.io/gogs/internal/cmd"
 	"gogs.io/gogs/internal/setting"
 )
 
-const Version = "0.11.96.1024"
+const Version = "0.11.96.1026"
 
 func init() {
 	setting.AppVer = Version
@@ -37,5 +38,7 @@ func main() {
 		cmd.Backup,
 		cmd.Restore,
 	}
-	app.Run(os.Args)
+	if err := app.Run(os.Args); err != nil {
+		log.Fatal(2, "Failed to run: %v", err)
+	}
 }
diff --git a/internal/cmd/import.go b/internal/cmd/import.go
index 4ee43b5b0..b274d1dda 100644
--- a/internal/cmd/import.go
+++ b/internal/cmd/import.go
@@ -7,6 +7,7 @@ package cmd
 import (
 	"bufio"
 	"bytes"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -43,14 +44,14 @@ without manually hacking the data files`,
 
 func runImportLocale(c *cli.Context) error {
 	if !c.IsSet("source") {
-		return fmt.Errorf("Source directory is not specified")
+		return errors.New("source directory is not specified")
 	} else if !c.IsSet("target") {
-		return fmt.Errorf("Target directory is not specified")
+		return errors.New("target directory is not specified")
 	}
 	if !com.IsDir(c.String("source")) {
-		return fmt.Errorf("Source directory does not exist or is not a directory")
+		return fmt.Errorf("source directory %q does not exist or is not a directory", c.String("source"))
 	} else if !com.IsDir(c.String("target")) {
-		return fmt.Errorf("Target directory does not exist or is not a directory")
+		return fmt.Errorf("target directory %q does not exist or is not a directory", c.String("target"))
 	}
 
 	if c.IsSet("config") {
diff --git a/templates/.VERSION b/templates/.VERSION
index b2eef69b9..f2aa9fff8 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.11.96.1024
+0.11.96.1026