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

fix: allow other dirs than vendor (#80)

Browse source
This commit is contained in:
Hang Xie 2020-02-08 05:46:51 -08:00 • committed by GitHub
parent 0ba0ff5522
commit 1d729c9517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/packages.go
View file

@ -76,7 +76,10 @@ func Ensure(direct spec.JsonnetFile, vendorDir string, oldLocks map[string]deps.
// remove them
for _, dir := range names {
name := strings.TrimPrefix(dir, "vendor/")
name, err := filepath.Rel(vendorDir, dir)
if err != nil {
return nil, err
}
if !known(locks, name) {
if err := os.RemoveAll(dir); err != nil {
return nil, err
@ -147,7 +150,7 @@ func linkLegacy(vendorDir string, locks map[string]deps.Dependency) error {
continue
}
legacyName := filepath.Join("vendor", d.LegacyName())
legacyName := filepath.Join(vendorDir, d.LegacyName())
pkgName := d.Name()
taken, err := checkLegacyNameTaken(legacyName, pkgName)