Skip to content

Commit

Permalink
Revert "Use correct project and directory in "already active shell" e…
Browse files Browse the repository at this point in the history
…rror message."

This reverts commit 1cf9727.
  • Loading branch information
mitchell-as committed Aug 22, 2023
1 parent 1cf9727 commit ca096f0
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions internal/runners/shell/shell.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package shell

import (
"os"

"github.com/ActiveState/cli/internal/analytics"
"github.com/ActiveState/cli/internal/config"
"github.com/ActiveState/cli/internal/constants"
"github.com/ActiveState/cli/internal/errs"
"github.com/ActiveState/cli/internal/locale"
"github.com/ActiveState/cli/internal/logging"
Expand Down Expand Up @@ -87,9 +84,7 @@ func (u *Shell) Run(params *Params) error {
}

if process.IsActivated(u.config) {
activatedProjectNamespace := os.Getenv(constants.ActivatedStateNamespaceEnvVarName)
activatedProjectDir := os.Getenv(constants.ActivatedStateEnvVarName)
return locale.NewInputError("err_shell_already_active", "", activatedProjectNamespace, activatedProjectDir)
return locale.NewInputError("err_shell_already_active", "", proj.NamespaceString(), proj.Dir())
}

u.out.Notice(locale.Tl("shell_project_statement", "",
Expand Down

0 comments on commit ca096f0

Please sign in to comment.