go-aah/aah#211 fixed init.go file generate for aah v0.10.x and below

go-aah · Aug 18, 2018 · 37e23ab · 37e23ab
1 parent 427dd22
commit 37e23ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/aah/new.go b/aah/new.go
@@ -497,11 +497,14 @@ func isAuthSchemeSupported(authScheme string) bool {
 func checkAndGenerateInitgoFile(importPath, baseDir string) {
 	initGoFile := filepath.Join(baseDir, "app", "init.go")
 	if !ess.IsFileExists(initGoFile) {
-		cliLog.Warn("***** In v0.10 'init.go' file introduced to evolve aah framework." +
-			" Since its not found, generating 'init.go' file. Please add it to your version control. *****\n")
+		cliLog.Warn("***** In aah v0.10 'init.go' file introduced to evolve aah framework." +
+			" Since its not found, generating 'init.go' file. Please add 'init.go' into VCS. *****\n")
 
-		aahToolsPath := aahToolsPath()
-		appTemplatePath := filepath.Join(aahToolsPath.Dir, "app-template")
+		appTmplBaseDir := inferAppTmplBaseDir()
+		if ess.IsStrEmpty(appTmplBaseDir) {
+			aahToolsPath := aahToolsPath()
+			appTmplBaseDir = filepath.Join(aahToolsPath.Dir, "app-template")
+		}
 		appType := typeAPI
 		if ess.IsFileExists(filepath.Join(baseDir, "views")) {
 			appType = typeWeb
@@ -514,7 +517,7 @@ func checkAndGenerateInitgoFile(importPath, baseDir string) {
 		}
 
 		processFile(baseDir, file{
-			src: filepath.Join(appTemplatePath, "app", "init.go.atmpl"),
+			src: filepath.Join(appTmplBaseDir, "app", "init.go.atmpl"),
 			dst: filepath.Join(baseDir, "app", "init.go"),
 		}, data)
 	}

diff --git a/aah/version.go b/aah/version.go
@@ -17,7 +17,7 @@ import (
 )
 
 // Version no. of aah framework CLI tool
-const Version = "0.12.1"
+const Version = "0.12.2"
 
 var (
 	errVersionNotExists = errors.New("version not exists")