fix app creation from file only

TIBCOSoftware · Nov 9, 2017 · 7db24e0 · 7db24e0
1 parent 0f36953
commit 7db24e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/api.go b/app/api.go
@@ -54,6 +54,9 @@ func CreateApp(env env.Project, appJson string, appDir string, appName string, v
 		}
 
 		descriptor.Name = appName
+	} else {
+		appName = descriptor.Name
+		appDir = path.Join(appDir, appName)
 	}
 
 	env.Init(appDir)

diff --git a/device/api.go b/device/api.go
@@ -54,6 +54,9 @@ func CreateDevice(project Project, deviceJson string, deviceDir string, deviceNa
 		}
 
 		descriptor.Name = deviceName
+	} else {
+		deviceName = descriptor.Name
+		deviceDir = path.Join(deviceDir, deviceName)
 	}
 
 	project.Init(deviceDir)