technofab/jsonnet-bundler
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/jsonnet-bundler.git synced 2025-12-12 08:00:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix LocalPackage install for relative paths

Browse source 
The vendor dir (here called "dir") is already joined with the CWD
in installCommand(). it should not be joined again here.

Also adds a logging message to show that a local package was
installed.
This commit is contained in:
Benoit Gagnon 2020-04-30 22:45:49 -04:00
parent ccd60c13eb
commit 13568d0b65
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/jb/install.go
View file

@ -72,7 +72,8 @@ func installCommand(dir, jsonnetHome string, uris []string, single bool) int {
} }
} }
locked, err := pkg.Ensure(jsonnetFile, filepath.Join(dir, jsonnetHome), lockFile.Dependencies) vendorDir := filepath.Join(dir, jsonnetHome)
locked, err := pkg.Ensure(jsonnetFile, vendorDir, lockFile.Dependencies)
kingpin.FatalIfError(err, "failed to install packages") kingpin.FatalIfError(err, "failed to install packages")
pkg.CleanLegacyName(jsonnetFile.Dependencies) pkg.CleanLegacyName(jsonnetFile.Dependencies)

5
pkg/local.go
View file

@ -19,6 +19,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/fatih/color"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps" "github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps"
@ -41,7 +42,7 @@ func (p *LocalPackage) Install(ctx context.Context, name, dir, version string) (
} }
oldname := filepath.Join(wd, p.Source.Directory) oldname := filepath.Join(wd, p.Source.Directory)
newname := filepath.Join(wd, filepath.Join(dir, name)) newname := filepath.Join(dir, name)
err = os.RemoveAll(newname) err = os.RemoveAll(newname)
if err != nil { if err != nil {
@ -58,5 +59,7 @@ func (p *LocalPackage) Install(ctx context.Context, name, dir, version string) (
return "", errors.Wrap(err, "failed to create symlink for local dependency: %w") return "", errors.Wrap(err, "failed to create symlink for local dependency: %w")
} }
color.Magenta("LOCAL %s -> %s", name, oldname)
return "", nil return "", nil
} }