@@ -22,9 +22,9 @@ import (
22
22
"go.jetpack.io/devbox/internal/cuecfg"
23
23
"go.jetpack.io/devbox/internal/debug"
24
24
"go.jetpack.io/devbox/internal/nix"
25
- "go.jetpack.io/devbox/internal/pkgcfg"
26
25
"go.jetpack.io/devbox/internal/planner"
27
26
"go.jetpack.io/devbox/internal/planner/plansdk"
27
+ "go.jetpack.io/devbox/internal/plugin"
28
28
"golang.org/x/exp/slices"
29
29
)
30
30
@@ -51,7 +51,7 @@ type Devbox struct {
51
51
cfg * Config
52
52
// configDir is the directory where the config file (devbox.json) resides
53
53
configDir string
54
- pluginManager * pkgcfg .Manager
54
+ pluginManager * plugin .Manager
55
55
writer io.Writer
56
56
}
57
57
@@ -76,7 +76,7 @@ func Open(dir string, writer io.Writer) (*Devbox, error) {
76
76
box := & Devbox {
77
77
cfg : cfg ,
78
78
configDir : cfgDir ,
79
- pluginManager : pkgcfg .NewManager (),
79
+ pluginManager : plugin .NewManager (),
80
80
writer : writer ,
81
81
}
82
82
return box , nil
@@ -110,13 +110,13 @@ func (d *Devbox) Add(pkgs ...string) error {
110
110
return err
111
111
}
112
112
113
- d .pluginManager .ApplyOptions (pkgcfg .WithAddMode ())
113
+ d .pluginManager .ApplyOptions (plugin .WithAddMode ())
114
114
if err := d .ensurePackagesAreInstalled (install ); err != nil {
115
115
return err
116
116
}
117
117
if featureflag .PKGConfig .Enabled () {
118
118
for _ , pkg := range pkgs {
119
- if err := pkgcfg .PrintReadme (
119
+ if err := plugin .PrintReadme (
120
120
pkg ,
121
121
d .configDir ,
122
122
d .writer ,
@@ -151,7 +151,7 @@ func (d *Devbox) Remove(pkgs ...string) error {
151
151
}
152
152
153
153
if featureflag .PKGConfig .Enabled () {
154
- if err := pkgcfg .Remove (d .configDir , uninstalledPackages ); err != nil {
154
+ if err := plugin .Remove (d .configDir , uninstalledPackages ); err != nil {
155
155
return err
156
156
}
157
157
}
@@ -207,14 +207,14 @@ func (d *Devbox) Shell() error {
207
207
}
208
208
209
209
if featureflag .PKGConfig .Enabled () {
210
- env , err := pkgcfg .Env (plan .DevPackages , d .configDir )
210
+ env , err := plugin .Env (plan .DevPackages , d .configDir )
211
211
if err != nil {
212
212
return err
213
213
}
214
214
opts = append (
215
215
opts ,
216
216
nix .WithEnvVariables (env ),
217
- nix .WithPKGConfigDir (filepath .Join (d .configDir , pkgcfg .VirtenvBinPath )),
217
+ nix .WithPKGConfigDir (filepath .Join (d .configDir , plugin .VirtenvBinPath )),
218
218
)
219
219
}
220
220
@@ -295,14 +295,14 @@ func (d *Devbox) RunScript(scriptName string) error {
295
295
}
296
296
297
297
if featureflag .PKGConfig .Enabled () {
298
- env , err := pkgcfg .Env (plan .DevPackages , d .configDir )
298
+ env , err := plugin .Env (plan .DevPackages , d .configDir )
299
299
if err != nil {
300
300
return err
301
301
}
302
302
opts = append (
303
303
opts ,
304
304
nix .WithEnvVariables (env ),
305
- nix .WithPKGConfigDir (filepath .Join (d .configDir , pkgcfg .VirtenvBinPath )),
305
+ nix .WithPKGConfigDir (filepath .Join (d .configDir , plugin .VirtenvBinPath )),
306
306
)
307
307
}
308
308
@@ -340,14 +340,14 @@ func (d *Devbox) Exec(cmds ...string) error {
340
340
env := []string {}
341
341
virtenvBinPath := ""
342
342
if featureflag .PKGConfig .Enabled () {
343
- envMap , err := pkgcfg .Env (d .cfg .Packages , d .configDir )
343
+ envMap , err := plugin .Env (d .cfg .Packages , d .configDir )
344
344
if err != nil {
345
345
return err
346
346
}
347
347
for k , v := range envMap {
348
348
env = append (env , fmt .Sprintf ("%s=%s" , k , v ))
349
349
}
350
- virtenvBinPath = filepath .Join (d .configDir , pkgcfg .VirtenvBinPath ) + ":"
350
+ virtenvBinPath = filepath .Join (d .configDir , plugin .VirtenvBinPath ) + ":"
351
351
}
352
352
pathWithProfileBin := fmt .Sprintf ("PATH=%s%s:$PATH" , virtenvBinPath , profileBinDir )
353
353
cmds = append ([]string {pathWithProfileBin }, cmds ... )
@@ -381,7 +381,7 @@ func (d *Devbox) Info(pkg string, markdown bool) error {
381
381
); err != nil {
382
382
return errors .WithStack (err )
383
383
}
384
- return pkgcfg .PrintReadme (
384
+ return plugin .PrintReadme (
385
385
pkg ,
386
386
d .configDir ,
387
387
d .writer ,
@@ -453,22 +453,22 @@ func (d *Devbox) saveCfg() error {
453
453
return cuecfg .WriteFile (cfgPath , d .cfg )
454
454
}
455
455
456
- func (d * Devbox ) Services () (pkgcfg .Services , error ) {
457
- return pkgcfg .GetServices (d .cfg .Packages , d .configDir )
456
+ func (d * Devbox ) Services () (plugin .Services , error ) {
457
+ return plugin .GetServices (d .cfg .Packages , d .configDir )
458
458
}
459
459
460
460
func (d * Devbox ) StartService (serviceName string ) error {
461
461
if ! IsDevboxShellEnabled () {
462
462
return d .Exec ("devbox" , "services" , "start" , serviceName )
463
463
}
464
- return pkgcfg .StartService (d .cfg .Packages , serviceName , d .configDir , d .writer )
464
+ return plugin .StartService (d .cfg .Packages , serviceName , d .configDir , d .writer )
465
465
}
466
466
467
467
func (d * Devbox ) StopService (serviceName string ) error {
468
468
if ! IsDevboxShellEnabled () {
469
469
return d .Exec ("devbox" , "services" , "stop" , serviceName )
470
470
}
471
- return pkgcfg .StopService (d .cfg .Packages , serviceName , d .configDir , d .writer )
471
+ return plugin .StopService (d .cfg .Packages , serviceName , d .configDir , d .writer )
472
472
}
473
473
474
474
func (d * Devbox ) generateShellFiles () error {
@@ -523,7 +523,7 @@ func (d *Devbox) ensurePackagesAreInstalled(mode installMode) error {
523
523
fmt .Println ("done." )
524
524
525
525
if featureflag .PKGConfig .Enabled () {
526
- if err := pkgcfg .RemoveInvalidSymlinks (d .configDir ); err != nil {
526
+ if err := plugin .RemoveInvalidSymlinks (d .configDir ); err != nil {
527
527
return err
528
528
}
529
529
}
0 commit comments