mirror of
https://github.com/containers/podman.git
synced 2025-10-25 18:25:59 +08:00
Fix spelling "setup" -> "set up" and similar
* Replace "setup", "lookup", "cleanup", "backup" with "set up", "look up", "clean up", "back up" when used as verbs. Replace also variations of those. * Improve language in a few places. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
This commit is contained in:
@ -73,7 +73,7 @@ func getUserInfo(name string) (string, string, string, error) {
|
||||
entry := readCapped(output)
|
||||
elements := strings.Split(entry, ":")
|
||||
if len(elements) < 9 || elements[0] != name {
|
||||
return "", "", "", errors.New("Could not lookup user")
|
||||
return "", "", "", errors.New("Could not look up user")
|
||||
}
|
||||
|
||||
return elements[0], elements[2], elements[8], nil
|
||||
@ -90,7 +90,7 @@ func getUser() (string, string, string, error) {
|
||||
|
||||
_, uid, home, err := getUserInfo(name)
|
||||
if err != nil {
|
||||
return "", "", "", fmt.Errorf("could not lookup user: %s", name)
|
||||
return "", "", "", fmt.Errorf("could not look up user: %s", name)
|
||||
}
|
||||
id, err := strconv.Atoi(uid)
|
||||
if err != nil {
|
||||
|
||||
@ -23,7 +23,7 @@ var (
|
||||
cleanupCommand = &cobra.Command{
|
||||
Annotations: map[string]string{registry.EngineMode: registry.ABIMode},
|
||||
Use: "cleanup [options] CONTAINER [CONTAINER...]",
|
||||
Short: "Cleanup network and mountpoints of one or more containers",
|
||||
Short: "Clean up network and mountpoints of one or more containers",
|
||||
Long: cleanupDescription,
|
||||
RunE: cleanup,
|
||||
Args: func(cmd *cobra.Command, args []string) error {
|
||||
|
||||
@ -15,7 +15,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
portDescription = `List port mappings for the CONTAINER, or lookup the public-facing port that is NAT-ed to the PRIVATE_PORT
|
||||
portDescription = `List port mappings for the CONTAINER, or look up the public-facing port that is NAT-ed to the PRIVATE_PORT
|
||||
`
|
||||
portCommand = &cobra.Command{
|
||||
Use: "port [options] CONTAINER [PORT]",
|
||||
|
||||
@ -92,7 +92,7 @@ func setXdgDirs() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Setup XDG_RUNTIME_DIR
|
||||
// Set up XDG_RUNTIME_DIR
|
||||
if _, found := os.LookupEnv("XDG_RUNTIME_DIR"); !found {
|
||||
dir, err := util.GetRuntimeDir()
|
||||
if err != nil {
|
||||
@ -110,7 +110,7 @@ func setXdgDirs() error {
|
||||
}
|
||||
}
|
||||
|
||||
// Setup XDG_CONFIG_HOME
|
||||
// Set up XDG_CONFIG_HOME
|
||||
if _, found := os.LookupEnv("XDG_CONFIG_HOME"); !found {
|
||||
cfgHomeDir, err := util.GetRootlessConfigHomeDir()
|
||||
if err != nil {
|
||||
|
||||
@ -188,7 +188,7 @@ func GetUserInfo(uri *url.URL) (*url.Userinfo, error) {
|
||||
if u, found := os.LookupEnv("_CONTAINERS_ROOTLESS_UID"); found {
|
||||
usr, err = user.LookupId(u)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to lookup rootless user")
|
||||
return nil, errors.Wrapf(err, "failed to look up rootless user")
|
||||
}
|
||||
} else {
|
||||
usr, err = user.Current()
|
||||
|
||||
@ -73,9 +73,9 @@ func CheckAllLatestAndIDFile(c *cobra.Command, args []string, ignoreArgLen bool,
|
||||
specifiedLatest, _ = c.Flags().GetBool("latest")
|
||||
if c.Flags().Lookup("all") == nil || c.Flags().Lookup("latest") == nil {
|
||||
if idFileFlag == "" {
|
||||
return errors.New("unable to lookup values for 'latest' or 'all'")
|
||||
return errors.New("unable to look up values for 'latest' or 'all'")
|
||||
} else if c.Flags().Lookup(idFileFlag) == nil {
|
||||
return errors.Errorf("unable to lookup values for 'latest', 'all', or '%s'", idFileFlag)
|
||||
return errors.Errorf("unable to look up values for 'latest', 'all', or '%s'", idFileFlag)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ func removePathFromRegistry(path string) error {
|
||||
k, err := registry.OpenKey(registry.CURRENT_USER, Environment, registry.READ|registry.WRITE)
|
||||
if err != nil {
|
||||
if errors.Is(err, fs.ErrNotExist) {
|
||||
// Nothing to cleanup, the Environment registry key does not exist.
|
||||
// Nothing to clean up, the Environment registry key does not exist.
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user