[mynewt-newt] branch 1_3_0_dev updated: fixed matchNamePath for windows and also aded -f to rm /tmp/* in build.sh so won't get prompt when removing write protected file

[ut...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

utzig pushed a commit to branch 1_3_0_dev
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git


The following commit(s) were added to refs/heads/1_3_0_dev by this push:
     new 9dc56b3  fixed matchNamePath for windows and also aded -f to rm /tmp/* in build.sh so won't get prompt when removing write protected file
9dc56b3 is described below

commit 9dc56b300cccb792f873c1528d312add9630baf4
Author: cwanda <wa...@happycity.com>
AuthorDate: Tue Nov 28 09:13:30 2017 -0800

    fixed matchNamePath for windows and also aded -f to rm /tmp/* in build.sh so won't get prompt when removing write protected file
---
 build.sh                 | 2 +-
 newt/pkg/localpackage.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 9405e6b..c4dbcbd 100755
--- a/build.sh
+++ b/build.sh
@@ -80,4 +80,4 @@ ln -s "$installdir" "$repodir"
 )
 
 ### Delete the temporary directory.
-rm -r "$godir"
+rm -rf "$godir"
diff --git a/newt/pkg/localpackage.go b/newt/pkg/localpackage.go
index efc6cd7..3b43687 100644
--- a/newt/pkg/localpackage.go
+++ b/newt/pkg/localpackage.go
@@ -296,8 +296,8 @@ func (pkg *LocalPackage) Save() error {
 
 func matchNamePath(name, path string) bool {
 	// assure that name and path use the same path separator...
-	names := filepath.SplitList(name)
-	name = filepath.Join(names...)
+	names := strings.Split(name, "/")
+	name = strings.Join(names, "/")
 
 	if strings.HasSuffix(path, name) {
 		return true

-- 
To stop receiving notification emails like this one, please contact
['"commits@mynewt.apache.org" <co...@mynewt.apache.org>'].