Merge pull request #20 for v0.12.1 Release

go-aah · Jul 21, 2018 · 5660eeb · 5660eeb
2 parents 536f960 + 16df967
commit 5660eeb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,6 @@ aah - A secure, flexible, rapid Go web framework.
 
 ### News
 
-  * aah CLI <a href="https://github.com/go-aah/tools/releases/latest"><img src="https://img.shields.io/badge/version-0.12.0-blue.svg" alt="Release Version"></a> [released](https://github.com/go-aah/tools/releases/latest) and tagged on Jul 08, 2018.
+  * aah CLI <a href="https://github.com/go-aah/tools/releases/latest"><img src="https://img.shields.io/badge/version-0.12.1-blue.svg" alt="Release Version"></a> [released](https://github.com/go-aah/tools/releases/latest) and tagged on Jul 20, 2018.
 
 Visit official website https://aahframework.org to learn more about `aah` framework.
diff --git a/aah/build.go b/aah/build.go
@@ -198,7 +198,9 @@ func copyFilesToWorkingDir(projectCfg *config.Config, appBaseDir, appBinary stri
 
 		if ess.IsFileExists(srcdir) {
 			if err = ess.CopyDir(buildBaseDir, srcdir, subTreeExcludes); err != nil {
-				return "", err
+				if !strings.HasSuffix(err.Error(), "/bin") {
+					return "", err
+				}
 			}
 		}
 	}

diff --git a/aah/util.go b/aah/util.go
@@ -39,13 +39,13 @@ func importPathRelwd() string {
 			if ess.IsFileExists(filepath.Join(appDir, aahProjectIdentifier)) {
 				importPath, _ = filepath.Rel(srcDir, appDir)
 				break
-			} else {
-				appDir = filepath.Dir(appDir)
 			}
 
 			if appDir == srcDir {
 				break
 			}
+
+			appDir = filepath.Dir(appDir)
 		}
 	}
 

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.0"
+const Version = "0.12.1"
 
 var (
 	errVersionNotExists = errors.New("version not exists")