generator/main.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"git.nobla.cn/golang/kos/util/env"
 	"io"
 	"net/http"
 	"os"
@@ -19,8 +18,8 @@ import (
 )
 
 var (
-	packageNameFlag = flag.String("package-name", "", "应用程序包名称")
-	versionFlag     = flag.String("version", env.Get("MOTO_VERSION", "v0.0.3"), "模板版本号，可以使用环境变量 MOTO_VERSION")
+	packageNameFlag = flag.String("package-name", "github.com/golang/example", "Application package name")
+	versionFlag     = flag.String("version", "v0.0.1", "Application package version")
 )
 
 var (
@@ -71,25 +70,29 @@ func extractFile(file string, dirname string) (err error) {
 		if header.Typeflag == tar.TypeXGlobalHeader {
 			continue
 		}
+		fileInfo := header.FileInfo()
 		if prefix == "" && header.Typeflag == tar.TypeDir {
 			prefix = header.Name
 			continue
 		}
-		realname := strings.TrimPrefix(header.Name, prefix)
-		if strings.HasPrefix(realname, "generator") {
-			continue
-		}
-		filename := path.Join(dirname, realname)
+		filename := path.Join(dirname, strings.TrimPrefix(header.Name, prefix))
 		if header.Typeflag == tar.TypeDir {
-			if err = os.MkdirAll(filename, 0755); err != nil {
+			if err = os.MkdirAll(filename, fileInfo.Mode().Perm()); err != nil {
 				return
 			}
+			if runtime.GOOS != "windows" {
+				if err = os.Chmod(filename, fileInfo.Mode().Perm()); err != nil {
+					return
+				}
+			}
 		} else {
 			if err = writeFile(filename, tarReader); err != nil {
 				return err
 			}
 			if runtime.GOOS != "windows" {
-				os.Chmod(filename, 0644)
+				if err = os.Chmod(filename, fileInfo.Mode().Perm()); err != nil {
+					return
+				}
 			}
 		}
 	}
@@ -160,33 +163,28 @@ func main() {
 	)
 	flag.Parse()
 	packageName = *packageNameFlag
-	if packageName == "" {
-		if len(os.Args) > 1 {
-			packageName = os.Args[1]
-		}
-	}
 	pos = strings.LastIndexByte(packageName, '/')
 	if pos == -1 {
-		fmt.Println("应用包名称是无效的")
+		fmt.Println("package name invalid")
 		os.Exit(1)
 	}
 	appname = packageName[pos:]
 	if dirname, err = os.Getwd(); err != nil {
-		fmt.Println("获取应用目录失败:" + err.Error())
+		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 	dirname = path.Join(dirname, appname)
 	if err = os.MkdirAll(dirname, 0755); err != nil {
-		fmt.Println("创建应用目录失败:" + err.Error())
+		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 	if err = downloadPackage(*versionFlag, dirname); err != nil {
-		fmt.Println("下载模板文件失败:" + err.Error())
+		fmt.Println("download file error:" + err.Error())
 		os.Exit(1)
 	}
 	if err = replaceFiles(dirname, oldPackageName, packageName); err != nil {
-		fmt.Println("生产应用文件失败:" + err.Error())
+		fmt.Println(err.Error())
 		os.Exit(1)
 	}
-	fmt.Println("创建项目成功")
+	fmt.Println("Create project successful !!!")
 }