grim/convey

stop messing the with HOME envvar, we don't need to and add back the ${VCS}_* envvars for backwards compatibility
redux
2021-12-18, Gary Kramlich
9e5fff47264d
Parents 86694452d869
Children f9638cf514da
stop messing the with HOME envvar, we don't need to and add back the ${VCS}_* envvars for backwards compatibility
1 files changed, 18 insertions(+), 32 deletions(-)
  • +18 -32
    environment/default.go
    • --- a/environment/default.go Sat Dec 18 06:13:34 2021 -0600
    +++ b/environment/default.go Sat Dec 18 06:57:44 2021 -0600
    @@ -49,38 +49,30 @@
    name := strings.ToUpper(repo.Name())
    - if err := e.setEnvOS("VCS", name); err != nil {
    - return err
    - }
    -
    - if err := e.setEnvOS("COMMIT", repo.Commit()); err != nil {
    - return err
    - }
    -
    - if err := e.setEnvOS("COMMIT_SHORT", repo.ShortCommit()); err != nil {
    - return err
    - }
    + vars := map[string]string{
    + "BRANCH": repo.Branch(),
    + "BRANCH_NORMALIZED": normalize.Normalize(repo.Branch()),
    + "COMMIT": repo.Commit(),
    + "COMMIT_SHORT": repo.ShortCommit(),
    + "REMOTE": repo.Remote(""),
    + "VCS": name,
    - if err := e.setEnvOS("COMMIT", repo.Commit()); err != nil {
    - return err
    - }
    -
    - if err := e.setEnvOS("BRANCH", repo.Branch()); err != nil {
    - return err
    - }
    -
    - if err := e.setEnvOS("BRANCH_NORMALIZED", normalize.Normalize(repo.Branch())); err != nil {
    - return err
    - }
    -
    - if err := e.setEnvOS("REMOTE", repo.Remote("")); err != nil {
    - return err
    + name + "_BRANCH": repo.Branch(),
    + name + "_BRANCH_NORMALIZED": normalize.Normalize(repo.Branch()),
    + name + "_COMMIT": repo.Commit(),
    + name + "_COMMIT_SHORT": repo.ShortCommit(),
    + name + "_REMOTE": repo.Remote(""),
    }
    // check for vcs specific values. If this grows past 1, make it a switch
    // type.
    if hg, ok := repo.(*hg.Mercurial); ok {
    - if err := e.setEnvOS("BOOKMARK", hg.Bookmark()); err != nil {
    + vars["BOOKMARK"] = hg.Bookmark()
    + vars["HG_BOOKMARK"] = hg.Bookmark()
    + }
    +
    + for k, v := range vars {
    + if err := e.setEnvOS(k, v); err != nil {
    return err
    }
    }
    @@ -90,12 +82,6 @@
    // LoadDefaults will load the default environment variables for a convey run.
    func (e Environment) LoadDefaults(wd string) error {
    - oldHome := os.Getenv("HOME")
    - e["HOME"] = "/tmp"
    - defer func() {
    - e["HOME"] = oldHome
    - }()
    -
    e["RUN_TIME"] = time.Now().UTC().Format("2006-01-02T15:04:05-0700")
    e["CONVEY_VERSION"] = consts.Version