Skip to content

Commit 35ca46d

Browse files
authored
[easy][nix] Add ensure message (#552)
## Summary Re-add message when ensuring packages are installed. ## How was it tested? `devbox shell`
1 parent 802074c commit 35ca46d

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

internal/impl/devbox.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -602,12 +602,14 @@ func (d *Devbox) ensurePackagesAreInstalled(mode installMode) error {
602602
installingVerb = "Uninstalling"
603603
}
604604

605-
if mode != ensure {
605+
if mode == ensure {
606+
fmt.Fprintln(d.writer, "Ensuring packages are installed.")
607+
} else {
606608
_, _ = fmt.Fprintf(d.writer, "%s nix packages.\n", installingVerb)
607609
}
608610

609611
// We need to re-install the packages
610-
if err := d.installNixProfile(mode); err != nil {
612+
if err := d.installNixProfile(); err != nil {
611613
fmt.Fprintln(d.writer)
612614
return errors.Wrap(err, "apply Nix derivation")
613615
}
@@ -667,7 +669,7 @@ func (d *Devbox) printPackageUpdateMessage(
667669

668670
// installNixProfile installs or uninstalls packages to or from this
669671
// devbox's Nix profile so that it matches what's in development.nix or flake.nix
670-
func (d *Devbox) installNixProfile(mode installMode) (err error) {
672+
func (d *Devbox) installNixProfile() (err error) {
671673
profileDir, err := d.profileDir()
672674
if err != nil {
673675
return err
@@ -691,10 +693,7 @@ func (d *Devbox) installNixProfile(mode installMode) (err error) {
691693
}
692694

693695
cmd.Env = nix.DefaultEnv()
694-
cmd.Stdout = &nixPackageInstallWriter{
695-
d.writer,
696-
lo.Ternary(mode != ensure, "\t", ""),
697-
}
696+
cmd.Stdout = &nixPackageInstallWriter{d.writer}
698697

699698
cmd.Stderr = cmd.Stdout
700699

internal/impl/writer.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ var nixPackageInstallIgnore = []string{
1111
}
1212

1313
type nixPackageInstallWriter struct {
14-
w io.Writer
15-
indent string
14+
w io.Writer
1615
}
1716

1817
func (fw *nixPackageInstallWriter) Write(p []byte) (n int, err error) {
1918
lines := strings.Split(string(p), "\n")
2019
for _, line := range lines {
2120
if line != "" && !fw.ignore(line) {
22-
_, err = io.WriteString(fw.w, fw.indent+line+"\n")
21+
_, err = io.WriteString(fw.w, "\t"+line+"\n")
2322
if err != nil {
2423
return
2524
}

0 commit comments

Comments
 (0)