kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

fix installing packages using workspace dir

Browse Source 
Signed-off-by: Tihomir Jovicic <tihomir.jovicic.develop@gmail.com>
This commit is contained in:
Tihomir Jovicic 2021-08-09 08:05:39 +02:00
parent 29ddcca32e
commit 4f8128abcb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/dagger/cmd/mod/get.go
View File

@ -60,7 +60,7 @@ var getCmd = &cobra.Command{
// download packages // download packages
for _, p := range packages { for _, p := range packages {
if err := processRequire(p, modFile); err != nil { if err := processRequire(workspace.Path, p, modFile); err != nil {
lg.Error().Err(err).Msg("error processing package") lg.Error().Err(err).Msg("error processing package")
} }
} }
@ -74,8 +74,8 @@ var getCmd = &cobra.Command{
}, },
} }
func processRequire(req *require, modFile *file) error { func processRequire(workspacePath string, req *require, modFile *file) error {
tmpPath := path.Join(tmpBasePath, req.repo) tmpPath := path.Join(workspacePath, tmpBasePath, req.repo)
if err := os.MkdirAll(tmpPath, 0755); err != nil { if err := os.MkdirAll(tmpPath, 0755); err != nil {
return fmt.Errorf("error creating tmp dir for cloning package") return fmt.Errorf("error creating tmp dir for cloning package")
} }
@ -87,10 +87,11 @@ func processRequire(req *require, modFile *file) error {
} }
existing := modFile.search(req) existing := modFile.search(req)
destPath := path.Join(workspacePath, destBasePath)
// requirement is new, so we should move the files and add it to the module.cue // requirement is new, so we should move the files and add it to the module.cue
if existing == nil { if existing == nil {
if err := move(req, tmpPath, destBasePath); err != nil { if err := move(req, tmpPath, destPath); err != nil {
return err return err
} }
modFile.require = append(modFile.require, req) modFile.require = append(modFile.require, req)
@ -114,7 +115,7 @@ func processRequire(req *require, modFile *file) error {
return err return err
} }
return replace(req, tmpPath, destBasePath) return replace(req, tmpPath, destPath)
} }
func compareVersions(reqV1, reqV2 string) (int, error) { func compareVersions(reqV1, reqV2 string) (int, error) {