unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Fix running subfolders (#1998)

Browse Source
This commit is contained in:
Janos Dobronszki
2020-09-11 12:57:23 +02:00
committed by GitHub
parent d2728b498c
commit 275e92be32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/local/local.go
View File

@@ -95,14 +95,14 @@ func (r *localRuntime) checkoutSourceIfNeeded(s *runtime.Service, secrets map[st
return err return err
} }
if len(sourceParts) > 1 { if len(sourceParts) > 1 {
lastFolderPart := s.Name lastFolderPart := tarName
fullp := append([]string{uncompressPath}, sourceParts[1:]...) fullp := append([]string{uncompressPath}, sourceParts[1:]...)
s.Source = filepath.Join(append(fullp, lastFolderPart)...) s.Source = filepath.Join(append(fullp, lastFolderPart)...)
} else { } else {
// The tar name is 'helloworld' for both // The tar name is 'helloworld' for both
// the case when the code is uploaded from `$REPO/helloworld` // the case when the code is uploaded from `$REPO/helloworld`
// and when it's uploaded from outside a repo ie `~/helloworld`. // and when it's uploaded from outside a repo ie `~/helloworld`.
if _, err := Entrypoint(filepath.Join(s.Source, tarName)); err == nil { if _, err := Entrypoint(filepath.Join(uncompressPath, tarName)); err == nil {
s.Source = filepath.Join(uncompressPath, tarName) s.Source = filepath.Join(uncompressPath, tarName)
} else { } else {
s.Source = uncompressPath s.Source = uncompressPath