Merge branch 'master' into rename-start-command

silphid · May 27, 2021 · 21640e3 · 21640e3
2 parents bc5ad6d + 0c7e901
commit 21640e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cmd/run/start.go b/src/cmd/run/start.go
@@ -32,8 +32,8 @@ func New() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().BoolVar(options.Remove, "rm", false, "removes container if true after exit")
-	cmd.Flags().BoolVar(&options.Reset, "reset", false, "when true will remove a previous container instance and start a fresh run")
+	cmd.Flags().BoolVar(options.Remove, "rm", false, "remove container upon exit")
+	cmd.Flags().BoolVar(&options.Reset, "reset", false, "remove previous container before starting a fresh one")
 
 	return cmd
 }

diff --git a/src/internal/contextFile.go b/src/internal/contextFile.go
@@ -122,7 +122,7 @@ func readAndParseContextFileFromURI(path string) (Contexts, error) {
 // LoadContexts reads the context file and returns the contexts. It starts by reading from current
 // working directory and resolves all parent context files.
 func LoadContexts() (Contexts, error) {
-	bytes, rootRCFile, err := readContextFileFromWorkingDirectory()
+	bytes, path, err := readContextFileFromWorkingDirectory()
 	if err != nil {
 		return Contexts{}, fmt.Errorf("failed to read context file: %w", err)
 	}
@@ -131,7 +131,7 @@ func LoadContexts() (Contexts, error) {
 	if err != nil {
 		return Contexts{}, err
 	}
-	contexts.Path = rootRCFile
+	contexts.Path = path
 
 	return contexts, nil
 }